* [U-Boot] [PATCH] kirkwood: ib62x0: use device tree and update config
@ 2013-10-14 2:38 Luka Perkov
2013-10-14 2:41 ` Fabio Estevam
0 siblings, 1 reply; 6+ messages in thread
From: Luka Perkov @ 2013-10-14 2:38 UTC (permalink / raw)
To: u-boot
Signed-off-by: Luka Perkov <luka@openwrt.org>
---
include/configs/ib62x0.h | 37 ++++++++++++++++++++-----------------
1 file changed, 20 insertions(+), 17 deletions(-)
diff --git a/include/configs/ib62x0.h b/include/configs/ib62x0.h
index 7fa0c53..90ed0fb 100644
--- a/include/configs/ib62x0.h
+++ b/include/configs/ib62x0.h
@@ -23,9 +23,9 @@
#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */
/*
- * Machine type
+ * Enable device tree support
*/
-#define CONFIG_MACH_TYPE MACH_TYPE_NAS6210
+#define CONFIG_OF_LIBFDT
/*
* Compression configuration
@@ -41,6 +41,7 @@
#define CONFIG_SYS_MVFS
#include <config_cmd_default.h>
#define CONFIG_CMD_ENV
+#define CONFIG_CMD_BOOTZ
#define CONFIG_CMD_IDE
#define CONFIG_CMD_MII
#define CONFIG_CMD_NAND
@@ -66,7 +67,7 @@
#define CONFIG_ENV_IS_NOWHERE
#endif
#define CONFIG_ENV_SIZE 0x20000
-#define CONFIG_ENV_OFFSET 0x80000
+#define CONFIG_ENV_OFFSET 0xe0000
/*
* Default environment variables
@@ -74,24 +75,26 @@
#define CONFIG_BOOTCOMMAND \
"setenv bootargs ${console} ${mtdparts} ${bootargs_root}; " \
"ubi part root; " \
- "ubifsmount ubi:root; " \
+ "ubifsmount ubi:rootfs; " \
"ubifsload 0x800000 ${kernel}; " \
- "ubifsload 0x1100000 ${initrd}; " \
- "bootm 0x800000 0x1100000"
-
-#define CONFIG_MTDPARTS \
- "mtdparts=orion_nand:" \
- "0x80000 at 0x0(uboot)," \
- "0x20000 at 0x80000(uboot_env)," \
- "- at 0xa0000(root)\0"
-
-#define CONFIG_EXTRA_ENV_SETTINGS \
+ "ubifsload 0x700000 ${fdt}; " \
+ "ubifsumount; " \
+ "fdt addr 0x700000 fdt resize; fdt chosen; " \
+ "bootz 0x800000 - 0x700000"
+
+#define CONFIG_MTDPARTS \
+ "mtdparts=orion_nand:" \
+ "0xe0000 at 0x0(uboot)," \
+ "0x20000 at 0xe0000(uboot_env)," \
+ "- at 0x100000(root)\0"
+
+#define CONFIG_EXTRA_ENV_SETTINGS \
"console=console=ttyS0,115200\0" \
"mtdids=nand0=orion_nand\0" \
"mtdparts="CONFIG_MTDPARTS \
- "kernel=/boot/uImage\0" \
- "initrd=/boot/uInitrd\0" \
- "bootargs_root=ubi.mtd=2 root=ubi0:root rootfstype=ubifs\0"
+ "kernel=/boot/zImage\0" \
+ "fdt=/boot/ib62x0.dtb\0" \
+ "bootargs_root=ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs rw\0"
/*
* Ethernet driver configuration
--
1.8.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [U-Boot] [PATCH] kirkwood: ib62x0: use device tree and update config
2013-10-14 2:38 [U-Boot] [PATCH] kirkwood: ib62x0: use device tree and update config Luka Perkov
@ 2013-10-14 2:41 ` Fabio Estevam
2013-10-14 9:40 ` Luka Perkov
0 siblings, 1 reply; 6+ messages in thread
From: Fabio Estevam @ 2013-10-14 2:41 UTC (permalink / raw)
To: u-boot
On Sun, Oct 13, 2013 at 11:38 PM, Luka Perkov <luka@openwrt.org> wrote:
> Signed-off-by: Luka Perkov <luka@openwrt.org>
> ---
> include/configs/ib62x0.h | 37 ++++++++++++++++++++-----------------
> 1 file changed, 20 insertions(+), 17 deletions(-)
>
> diff --git a/include/configs/ib62x0.h b/include/configs/ib62x0.h
> index 7fa0c53..90ed0fb 100644
> --- a/include/configs/ib62x0.h
> +++ b/include/configs/ib62x0.h
> @@ -23,9 +23,9 @@
> #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */
>
> /*
> - * Machine type
> + * Enable device tree support
> */
> -#define CONFIG_MACH_TYPE MACH_TYPE_NAS6210
> +#define CONFIG_OF_LIBFDT
I am not familiar with this platform, but couldn't you also keep
CONFIG_MACH_TYPE ?
This way people have the option to load both dt and non-dt kernels.
Regards,
Fabio Estevam
^ permalink raw reply [flat|nested] 6+ messages in thread
* [U-Boot] [PATCH] kirkwood: ib62x0: use device tree and update config
2013-10-14 2:41 ` Fabio Estevam
@ 2013-10-14 9:40 ` Luka Perkov
2013-10-21 22:28 ` Marek Vasut
0 siblings, 1 reply; 6+ messages in thread
From: Luka Perkov @ 2013-10-14 9:40 UTC (permalink / raw)
To: u-boot
Hi Fabio,
On Sun, Oct 13, 2013 at 11:41:44PM -0300, Fabio Estevam wrote:
> On Sun, Oct 13, 2013 at 11:38 PM, Luka Perkov <luka@openwrt.org> wrote:
> > /*
> > - * Machine type
> > + * Enable device tree support
> > */
> > -#define CONFIG_MACH_TYPE MACH_TYPE_NAS6210
> > +#define CONFIG_OF_LIBFDT
>
> I am not familiar with this platform, but couldn't you also keep
> CONFIG_MACH_TYPE ?
>
> This way people have the option to load both dt and non-dt kernels.
Upstream uses only DT. When uboot support was pushed we had non-DT
kernel patches that were never merged upstream. IMO we should just drop
CONFIG_MACH_TYPE and use CONFIG_OF_LIBFDT.
Luka
^ permalink raw reply [flat|nested] 6+ messages in thread
* [U-Boot] [PATCH] kirkwood: ib62x0: use device tree and update config
2013-10-14 9:40 ` Luka Perkov
@ 2013-10-21 22:28 ` Marek Vasut
0 siblings, 0 replies; 6+ messages in thread
From: Marek Vasut @ 2013-10-21 22:28 UTC (permalink / raw)
To: u-boot
Dear Luka Perkov,
> Hi Fabio,
>
> On Sun, Oct 13, 2013 at 11:41:44PM -0300, Fabio Estevam wrote:
> > On Sun, Oct 13, 2013 at 11:38 PM, Luka Perkov <luka@openwrt.org> wrote:
> > > /*
> > >
> > > - * Machine type
> > > + * Enable device tree support
> > >
> > > */
> > >
> > > -#define CONFIG_MACH_TYPE MACH_TYPE_NAS6210
> > > +#define CONFIG_OF_LIBFDT
> >
> > I am not familiar with this platform, but couldn't you also keep
> > CONFIG_MACH_TYPE ?
> >
> > This way people have the option to load both dt and non-dt kernels.
>
> Upstream uses only DT. When uboot support was pushed we had non-DT
> kernel patches that were never merged upstream. IMO we should just drop
> CONFIG_MACH_TYPE and use CONFIG_OF_LIBFDT.
You are breaking compatibility here, so you should keep the machine ID .
Best regards,
Marek Vasut
^ permalink raw reply [flat|nested] 6+ messages in thread
* [U-Boot] [PATCH] kirkwood: ib62x0: use device tree and update config
@ 2013-10-31 3:05 Luka Perkov
2013-10-31 3:33 ` Prafulla Wadaskar
0 siblings, 1 reply; 6+ messages in thread
From: Luka Perkov @ 2013-10-31 3:05 UTC (permalink / raw)
To: u-boot
Signed-off-by: Luka Perkov <luka@openwrt.org>
CC: Prafulla Wadaskar <prafulla@marvell.com>
---
v1->v2:
* keep CONFIG_MACH_TYPE define for backwards compatibility
---
include/configs/ib62x0.h | 38 +++++++++++++++++++++++---------------
1 file changed, 23 insertions(+), 15 deletions(-)
diff --git a/include/configs/ib62x0.h b/include/configs/ib62x0.h
index 7fa0c53..186fd35 100644
--- a/include/configs/ib62x0.h
+++ b/include/configs/ib62x0.h
@@ -28,6 +28,11 @@
#define CONFIG_MACH_TYPE MACH_TYPE_NAS6210
/*
+ * Enable device tree support
+ */
+#define CONFIG_OF_LIBFDT
+
+/*
* Compression configuration
*/
#define CONFIG_BZIP2
@@ -41,6 +46,7 @@
#define CONFIG_SYS_MVFS
#include <config_cmd_default.h>
#define CONFIG_CMD_ENV
+#define CONFIG_CMD_BOOTZ
#define CONFIG_CMD_IDE
#define CONFIG_CMD_MII
#define CONFIG_CMD_NAND
@@ -66,7 +72,7 @@
#define CONFIG_ENV_IS_NOWHERE
#endif
#define CONFIG_ENV_SIZE 0x20000
-#define CONFIG_ENV_OFFSET 0x80000
+#define CONFIG_ENV_OFFSET 0xe0000
/*
* Default environment variables
@@ -74,24 +80,26 @@
#define CONFIG_BOOTCOMMAND \
"setenv bootargs ${console} ${mtdparts} ${bootargs_root}; " \
"ubi part root; " \
- "ubifsmount ubi:root; " \
+ "ubifsmount ubi:rootfs; " \
"ubifsload 0x800000 ${kernel}; " \
- "ubifsload 0x1100000 ${initrd}; " \
- "bootm 0x800000 0x1100000"
-
-#define CONFIG_MTDPARTS \
- "mtdparts=orion_nand:" \
- "0x80000 at 0x0(uboot)," \
- "0x20000 at 0x80000(uboot_env)," \
- "- at 0xa0000(root)\0"
-
-#define CONFIG_EXTRA_ENV_SETTINGS \
+ "ubifsload 0x700000 ${fdt}; " \
+ "ubifsumount; " \
+ "fdt addr 0x700000; fdt resize; fdt chosen; " \
+ "bootz 0x800000 - 0x700000"
+
+#define CONFIG_MTDPARTS \
+ "mtdparts=orion_nand:" \
+ "0xe0000 at 0x0(uboot)," \
+ "0x20000 at 0xe0000(uboot_env)," \
+ "- at 0x100000(root)\0"
+
+#define CONFIG_EXTRA_ENV_SETTINGS \
"console=console=ttyS0,115200\0" \
"mtdids=nand0=orion_nand\0" \
"mtdparts="CONFIG_MTDPARTS \
- "kernel=/boot/uImage\0" \
- "initrd=/boot/uInitrd\0" \
- "bootargs_root=ubi.mtd=2 root=ubi0:root rootfstype=ubifs\0"
+ "kernel=/boot/zImage\0" \
+ "fdt=/boot/ib62x0.dtb\0" \
+ "bootargs_root=ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs rw\0"
/*
* Ethernet driver configuration
--
1.8.4.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* [U-Boot] [PATCH] kirkwood: ib62x0: use device tree and update config
2013-10-31 3:05 Luka Perkov
@ 2013-10-31 3:33 ` Prafulla Wadaskar
0 siblings, 0 replies; 6+ messages in thread
From: Prafulla Wadaskar @ 2013-10-31 3:33 UTC (permalink / raw)
To: u-boot
> -----Original Message-----
> From: Luka Perkov [mailto:luka at openwrt.org]
> Sent: 31 October 2013 08:35
> To: u-boot at lists.denx.de
> Cc: Luka Perkov; Prafulla Wadaskar
> Subject: [PATCH] kirkwood: ib62x0: use device tree and
> update config
>
> Signed-off-by: Luka Perkov <luka@openwrt.org>
> CC: Prafulla Wadaskar <prafulla@marvell.com>
> ---
> v1->v2:
>
> * keep CONFIG_MACH_TYPE define for backwards
> compatibility
> ---
> include/configs/ib62x0.h | 38 +++++++++++++++++++++++-
> --------------
> 1 file changed, 23 insertions(+), 15 deletions(-)
>
> diff --git a/include/configs/ib62x0.h
> b/include/configs/ib62x0.h
> index 7fa0c53..186fd35 100644
> --- a/include/configs/ib62x0.h
> +++ b/include/configs/ib62x0.h
> @@ -28,6 +28,11 @@
> #define CONFIG_MACH_TYPE MACH_TYPE_NAS6210
>
> /*
> + * Enable device tree support
> + */
> +#define CONFIG_OF_LIBFDT
> +
> +/*
> * Compression configuration
> */
> #define CONFIG_BZIP2
> @@ -41,6 +46,7 @@
> #define CONFIG_SYS_MVFS
> #include <config_cmd_default.h>
> #define CONFIG_CMD_ENV
> +#define CONFIG_CMD_BOOTZ
> #define CONFIG_CMD_IDE
> #define CONFIG_CMD_MII
> #define CONFIG_CMD_NAND
> @@ -66,7 +72,7 @@
> #define CONFIG_ENV_IS_NOWHERE
> #endif
> #define CONFIG_ENV_SIZE 0x20000
> -#define CONFIG_ENV_OFFSET 0x80000
> +#define CONFIG_ENV_OFFSET 0xe0000
>
> /*
> * Default environment variables
> @@ -74,24 +80,26 @@
> #define CONFIG_BOOTCOMMAND \
> "setenv bootargs ${console} ${mtdparts}
> ${bootargs_root}; " \
> "ubi part root; " \
> - "ubifsmount ubi:root; " \
> + "ubifsmount ubi:rootfs; " \
> "ubifsload 0x800000 ${kernel}; " \
> - "ubifsload 0x1100000 ${initrd}; " \
> - "bootm 0x800000 0x1100000"
> -
> -#define CONFIG_MTDPARTS \
> - "mtdparts=orion_nand:" \
> - "0x80000 at 0x0(uboot)," \
> - "0x20000 at 0x80000(uboot_env)," \
> - "- at 0xa0000(root)\0"
> -
> -#define CONFIG_EXTRA_ENV_SETTINGS \
> + "ubifsload 0x700000 ${fdt}; " \
> + "ubifsumount; " \
> + "fdt addr 0x700000; fdt resize; fdt chosen; "
> \
> + "bootz 0x800000 - 0x700000"
> +
> +#define CONFIG_MTDPARTS \
> + "mtdparts=orion_nand:" \
> + "0xe0000 at 0x0(uboot)," \
> + "0x20000 at 0xe0000(uboot_env)," \
> + "- at 0x100000(root)\0"
> +
> +#define CONFIG_EXTRA_ENV_SETTINGS \
> "console=console=ttyS0,115200\0" \
> "mtdids=nand0=orion_nand\0" \
> "mtdparts="CONFIG_MTDPARTS \
> - "kernel=/boot/uImage\0" \
> - "initrd=/boot/uInitrd\0" \
> - "bootargs_root=ubi.mtd=2 root=ubi0:root
> rootfstype=ubifs\0"
> + "kernel=/boot/zImage\0" \
> + "fdt=/boot/ib62x0.dtb\0" \
> + "bootargs_root=ubi.mtd=2 root=ubi0:rootfs
> rootfstype=ubifs rw\0"
>
> /*
> * Ethernet driver configuration
> --
Acked-By: Prafulla Wadaskar <prafulla@marvell.com>
Regards...
Prafulla . . .
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-10-31 3:33 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-14 2:38 [U-Boot] [PATCH] kirkwood: ib62x0: use device tree and update config Luka Perkov
2013-10-14 2:41 ` Fabio Estevam
2013-10-14 9:40 ` Luka Perkov
2013-10-21 22:28 ` Marek Vasut
-- strict thread matches above, loose matches on Subject: below --
2013-10-31 3:05 Luka Perkov
2013-10-31 3:33 ` Prafulla Wadaskar
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox