From 07dc9b8284fbe0405e3cf63740a6536e79cbc5db Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 21 Apr 2014 12:43:34 -0500 Subject: [PATCH] update to final 2014.04 - put all images into a single rpm - add udoo image --- ...AULT_LINUX_BOOT_ENV-environment-stri.patch | 6 +- ...e-the-ramdisk-args-we-pass-things-in.patch | 6 +- ...e-the-ramdisk-args-we-pass-things-in.patch | 4 +- ...naly-check-for-fdt_file-env-variable.patch | 32 + ...rt-snowball-to-distro-generic-config.patch | 131 ++++ ...ver-to-use-the-generic-distro-config.patch | 58 +- ...o-use-the-generic-distro-configuatio.patch | 168 ++++ ...over-to-use-the-generic-distro-confi.patch | 56 +- 0009-fix-up-some-sillies.patch | 93 --- ...over-to-use-the-generic-distro-confi.patch | 119 +-- ...a-generic-set-of-boot-commands-defin.patch | 33 +- ...oard-to-ensure-the-environment-is-co.patch | 59 -- ...patch => 0011-add-README.distro-file.patch | 15 +- ...convert-fdt_file-to-fdtfile-globally.patch | 738 ------------------ ...e-and-fdt_file-to-find-the-devicetre.patch | 31 - ...up-duplicate-options-in-paz00-config.patch | 25 + ...ish-utilite-build-based-on-wandboard.patch | 601 ++++++++++++++ ...ps-to-make-panda-and-beaglebone-work.patch | 52 -- ...common.h-generic-distro-environment-.patch | 29 + sources | 2 +- uboot-tools.spec | 260 ++---- 21 files changed, 1211 insertions(+), 1307 deletions(-) create mode 100644 0004-pxe-additionaly-check-for-fdt_file-env-variable.patch create mode 100644 0005-convert-snowball-to-distro-generic-config.patch rename 0006-convert-wandboard-to-use-generic-boot-commands.patch => 0006-move-wandboard-over-to-use-the-generic-distro-config.patch (80%) create mode 100644 0007-move-udoo-over-to-use-the-generic-distro-configuatio.patch rename 0008-convert-pandaboard-to-use-generic-boot-commands.patch => 0008-move-pandaboard-over-to-use-the-generic-distro-confi.patch (67%) delete mode 100644 0009-fix-up-some-sillies.patch rename 0007-convert-beaglebone-to-use-generic-boot-commands.patch => 0009-move-beaglebone-over-to-use-the-generic-distro-confi.patch (56%) rename 0005-add-generic-bootcmd-header.patch => 0010-add-header-with-a-generic-set-of-boot-commands-defin.patch (84%) delete mode 100644 0010-fixups-for-wandboard-to-ensure-the-environment-is-co.patch rename 0004-add-README.distro.patch => 0011-add-README.distro-file.patch (87%) delete mode 100644 0011-convert-fdt_file-to-fdtfile-globally.patch delete mode 100644 0012-check-for-fdtfile-and-fdt_file-to-find-the-devicetre.patch create mode 100644 0012-cleanup-duplicate-options-in-paz00-config.patch create mode 100644 0013-add-hackish-utilite-build-based-on-wandboard.patch delete mode 100644 0013-cleanups-to-make-panda-and-beaglebone-work.patch create mode 100644 0014-add-to-ti_armv7_common.h-generic-distro-environment-.patch diff --git a/0001-TI-Add-use-a-DEFAULT_LINUX_BOOT_ENV-environment-stri.patch b/0001-TI-Add-use-a-DEFAULT_LINUX_BOOT_ENV-environment-stri.patch index a1a8966..36980b1 100644 --- a/0001-TI-Add-use-a-DEFAULT_LINUX_BOOT_ENV-environment-stri.patch +++ b/0001-TI-Add-use-a-DEFAULT_LINUX_BOOT_ENV-environment-stri.patch @@ -1,7 +1,7 @@ -From 45742e6678a80a8503c58c06c7c81e144ef370eb Mon Sep 17 00:00:00 2001 +From 797867f56b9e3e2307fc2537b062b8a482d4b472 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 11 Mar 2014 15:42:01 -0400 -Subject: [PATCH 01/13] TI: Add, use a DEFAULT_LINUX_BOOT_ENV environment +Subject: [PATCH 01/14] TI: Add, use a DEFAULT_LINUX_BOOT_ENV environment string To deal with a reoccurring problem properly we need to specify addresses @@ -23,7 +23,7 @@ Signed-off-by: Tom Rini 5 files changed, 25 insertions(+), 16 deletions(-) diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h -index 2020e7f..6bd8aec 100644 +index ea9e758..4148517 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -61,11 +61,8 @@ diff --git a/0002-am335x_evm-Update-the-ramdisk-args-we-pass-things-in.patch b/0002-am335x_evm-Update-the-ramdisk-args-we-pass-things-in.patch index ea426e6..f275400 100644 --- a/0002-am335x_evm-Update-the-ramdisk-args-we-pass-things-in.patch +++ b/0002-am335x_evm-Update-the-ramdisk-args-we-pass-things-in.patch @@ -1,7 +1,7 @@ -From 05e9d82d71560140a58c3e430b788b3058129fe7 Mon Sep 17 00:00:00 2001 +From 9c80863e93e251b7068a7a9945694a72a300f505 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 11 Mar 2014 15:42:02 -0400 -Subject: [PATCH 02/13] am335x_evm: Update the ramdisk args, we pass things in +Subject: [PATCH 02/14] am335x_evm: Update the ramdisk args, we pass things in just fine via DT Signed-off-by: Tom Rini @@ -10,7 +10,7 @@ Signed-off-by: Tom Rini 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h -index 6bd8aec..11088b3 100644 +index 4148517..ebe2ab3 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -79,7 +79,7 @@ diff --git a/0003-am43xx_evm-Update-the-ramdisk-args-we-pass-things-in.patch b/0003-am43xx_evm-Update-the-ramdisk-args-we-pass-things-in.patch index 3d6a999..086aafd 100644 --- a/0003-am43xx_evm-Update-the-ramdisk-args-we-pass-things-in.patch +++ b/0003-am43xx_evm-Update-the-ramdisk-args-we-pass-things-in.patch @@ -1,7 +1,7 @@ -From ccfaf09da55fa9f107a6866fa2bc00af6764c453 Mon Sep 17 00:00:00 2001 +From d7b992e954721ce563093ab480e93ebe5222ca6e Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 11 Mar 2014 15:42:03 -0400 -Subject: [PATCH 03/13] am43xx_evm: Update the ramdisk args, we pass things in +Subject: [PATCH 03/14] am43xx_evm: Update the ramdisk args, we pass things in just fine via DT Signed-off-by: Tom Rini diff --git a/0004-pxe-additionaly-check-for-fdt_file-env-variable.patch b/0004-pxe-additionaly-check-for-fdt_file-env-variable.patch new file mode 100644 index 0000000..91c68b5 --- /dev/null +++ b/0004-pxe-additionaly-check-for-fdt_file-env-variable.patch @@ -0,0 +1,32 @@ +From 93d278a447956d0ec62c23215d1998cadd4c5f09 Mon Sep 17 00:00:00 2001 +From: Dennis Gilmore +Date: Mon, 21 Apr 2014 12:07:23 -0500 +Subject: [PATCH 04/14] pxe: additionaly check for fdt_file env variable + +some boards have used fdt_file while others have used fdtfile to +define the name of the fdt file. If we do notget a fdtfile environment +variable, additionally check for fdt_file. +--- + common/cmd_pxe.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/common/cmd_pxe.c b/common/cmd_pxe.c +index 3483328..9c43e63 100644 +--- a/common/cmd_pxe.c ++++ b/common/cmd_pxe.c +@@ -712,6 +712,12 @@ static int label_boot(cmd_tbl_t *cmdtp, struct pxe_label *label) + char *f1, *f2, *f3, *f4, *slash; + + f1 = getenv("fdtfile"); ++ /* ++ * some boards have used fdt_file as the environment variable for ++ * defining the device tree file so lets check for fdt_file also. ++ */ ++ if (!f1) ++ f1 = getenv("fdt_file"); + if (f1) { + f2 = ""; + f3 = ""; +-- +1.9.0 + diff --git a/0005-convert-snowball-to-distro-generic-config.patch b/0005-convert-snowball-to-distro-generic-config.patch new file mode 100644 index 0000000..5948baf --- /dev/null +++ b/0005-convert-snowball-to-distro-generic-config.patch @@ -0,0 +1,131 @@ +From 77d98dff1c43a7d87c3a1d4c55f4abea47d4d6f9 Mon Sep 17 00:00:00 2001 +From: Dennis Gilmore +Date: Mon, 21 Apr 2014 12:15:35 -0500 +Subject: [PATCH 05/14] convert snowball to distro generic config + +--- + include/configs/snowball.h | 78 +++++++++------------------------------------- + 1 file changed, 15 insertions(+), 63 deletions(-) + +diff --git a/include/configs/snowball.h b/include/configs/snowball.h +index dacb560..e53b467 100644 +--- a/include/configs/snowball.h ++++ b/include/configs/snowball.h +@@ -74,7 +74,6 @@ + */ + #define CONFIG_MMC + #define CONFIG_GENERIC_MMC +-#define CONFIG_DOS_PARTITION + + /* + * Commands +@@ -90,82 +89,37 @@ + #define CONFIG_CMD_LOADS + #define CONFIG_CMD_LOADB + #define CONFIG_CMD_MMC +-#define CONFIG_CMD_FAT +-#define CONFIG_CMD_EXT2 + #define CONFIG_CMD_SOURCE + +-#ifndef CONFIG_BOOTDELAY +-#define CONFIG_BOOTDELAY 1 +-#endif ++#ifndef CONFIG_SPL_BUILD ++#include ++#include ++ + #define CONFIG_ZERO_BOOTDELAY_CHECK /* check for keypress on bootdelay==0 */ + +-#undef CONFIG_BOOTARGS + #define CONFIG_BOOTCOMMAND \ +-"mmc dev 1; " \ +- "if run loadbootscript; " \ +- "then run bootscript; " \ +- "else " \ +- "if run mmcload; " \ +- "then run mmcboot; " \ +- "else " \ +- "mmc dev 0; " \ +- "if run emmcloadbootscript; " \ +- "then run bootscript; " \ +- "else " \ +- "if run emmcload; " \ +- "then run emmcboot; " \ +- "else " \ +- "echo No media to boot from; " \ +- "fi; " \ +- "fi; " \ +- "fi; " \ +- "fi; " ++ "for target in ${boot_targets}; do run bootcmd_${target}; done " + + #define CONFIG_EXTRA_ENV_SETTINGS \ +- "verify=n\0" \ + "loadaddr=0x00100000\0" \ + "console=ttyAMA2,115200n8\0" \ +- "loadbootscript=fatload mmc 1:1 ${loadaddr} boot.scr\0" \ +- "emmcloadbootscript=fatload mmc 0:2 ${loadaddr} boot.scr\0" \ +- "bootscript=echo Running bootscript " \ +- "from mmc ...; source ${loadaddr}\0" \ +- "memargs256=mem=96M@0 mem_modem=32M@96M mem=32M@128M " \ +- "hwmem=22M@160M pmem_hwb=42M@182M mem_mali=32@224M\0" \ +- "memargs512=mem=96M@0 mem_modem=32M@96M hwmem=32M@128M " \ +- "mem=64M@160M mem_mali=32M@224M " \ +- "pmem_hwb=128M@256M mem=128M@384M\0" \ +- "memargs1024=mem=128M@0 mali.mali_mem=32M@128M " \ +- "hwmem=168M@M160M mem=48M@328M " \ +- "mem_issw=1M@383M mem=640M@384M\0" \ +- "memargs=setenv bootargs ${bootargs} ${memargs1024}\0" \ +- "emmcload=fatload mmc 0:2 ${loadaddr} uImage\0" \ +- "mmcload=fatload mmc 1:1 ${loadaddr} uImage\0" \ +- "commonargs=setenv bootargs console=${console} " \ +- "vmalloc=300M\0" \ +- "emmcargs=setenv bootargs ${bootargs} " \ +- "root=/dev/mmcblk0p3 " \ +- "rootwait\0" \ +- "addcons=setenv bootargs ${bootargs} " \ +- "console=${console}\0" \ +- "emmcboot=echo Booting from eMMC ...; " \ +- "run commonargs emmcargs memargs; " \ +- "bootm ${loadaddr}\0" \ +- "mmcargs=setenv bootargs ${bootargs} " \ +- "root=/dev/mmcblk1p2 " \ +- "rootwait earlyprintk\0" \ +- "mmcboot=echo Booting from external MMC ...; " \ +- "run commonargs mmcargs memargs; " \ +- "bootm ${loadaddr}\0" \ +- "fdt_high=0x2BC00000\0" \ ++ "kernel_addr_r=0x01100000\0" \ ++ "scriptaddr=0x07F00000\0" \ ++ "pxefile_addr_r=0x08000000\0" \ ++ "fdt_addr_r=0x08100000\0" \ ++ "ramdisk_addr_r=0x08200000\0" \ + "stdout=serial,usbtty\0" \ + "stdin=serial,usbtty\0" \ +- "stderr=serial,usbtty\0" ++ "stderr=serial,usbtty\0" \ ++ "fdtfile=ste-snowball.dtb\0" \ ++ "bootm_size=0x20000000\0" \ ++ BOOTCMDS_COMMON + ++#endif + /*----------------------------------------------------------------------- + * Miscellaneous configurable options + */ + +-#define CONFIG_SYS_LONGHELP /* undef to save memory */ + #define CONFIG_SYS_PROMPT "U8500 $ " /* Monitor Command Prompt */ + #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ + +@@ -179,8 +133,6 @@ + #define CONFIG_SYS_LOAD_ADDR 0x00100000 /* default load address */ + #define CONFIG_SYS_LOADS_BAUD_CHANGE 1 + +-#define CONFIG_SYS_HUSH_PARSER 1 +-#define CONFIG_CMDLINE_EDITING + + #define CONFIG_SETUP_MEMORY_TAGS 2 + #define CONFIG_INITRD_TAG 1 +-- +1.9.0 + diff --git a/0006-convert-wandboard-to-use-generic-boot-commands.patch b/0006-move-wandboard-over-to-use-the-generic-distro-config.patch similarity index 80% rename from 0006-convert-wandboard-to-use-generic-boot-commands.patch rename to 0006-move-wandboard-over-to-use-the-generic-distro-config.patch index 8908f3d..15f016f 100644 --- a/0006-convert-wandboard-to-use-generic-boot-commands.patch +++ b/0006-move-wandboard-over-to-use-the-generic-distro-config.patch @@ -1,29 +1,21 @@ -From 3cc8719c60bb9d4bea7484c8f5533345390a6986 Mon Sep 17 00:00:00 2001 +From fa49dd96a3b4e9ca66480d4b729f6ae543b82e17 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore -Date: Sat, 8 Mar 2014 10:59:00 -0600 -Subject: [PATCH 06/13] convert wandboard to use generic boot commands +Date: Mon, 21 Apr 2014 12:17:14 -0500 +Subject: [PATCH 06/14] move wandboard over to use the generic distro + configuation and environment +port wandboard to use the generic distro configuation. +remove duplicated config options, clean up the environment, include new +environment. --- - include/configs/wandboard.h | 91 +++++++-------------------------------------- - 1 file changed, 14 insertions(+), 77 deletions(-) + include/configs/wandboard.h | 92 +++++++-------------------------------------- + 1 file changed, 14 insertions(+), 78 deletions(-) diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h -index 6c74c72..6aaa439 100644 +index 6c74c72..386fe78 100644 --- a/include/configs/wandboard.h +++ b/include/configs/wandboard.h -@@ -41,6 +41,11 @@ - #define CONFIG_CONS_INDEX 1 - #define CONFIG_BAUDRATE 115200 - -+#ifndef CONFIG_SPL_BUILD -+#include -+#include -+#endif -+ - /* Command definition */ - #include - -@@ -49,8 +54,6 @@ +@@ -49,8 +49,6 @@ #define CONFIG_CMD_BMODE #define CONFIG_CMD_SETEXPR @@ -32,7 +24,7 @@ index 6c74c72..6aaa439 100644 #define CONFIG_SYS_MEMTEST_START 0x10000000 #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 500 * SZ_1M) #define CONFIG_LOADADDR 0x12000000 -@@ -66,15 +69,8 @@ +@@ -66,15 +64,8 @@ #define CONFIG_CMD_MMC #define CONFIG_GENERIC_MMC #define CONFIG_BOUNCE_BUFFER @@ -48,26 +40,38 @@ index 6c74c72..6aaa439 100644 #define CONFIG_FEC_MXC #define CONFIG_MII #define IMX_FEC_BASE ENET_BASE_ADDR -@@ -111,11 +107,15 @@ +@@ -100,6 +91,11 @@ + #define CONFIG_IPUV3_CLK 260000000 + #define CONFIG_IMX_HDMI + ++#ifndef CONFIG_SPL_BUILD ++#include ++#include ++#endif ++ + #if defined(CONFIG_MX6DL) || defined(CONFIG_MX6S) + #define CONFIG_DEFAULT_FDT_FILE "imx6dl-wandboard.dtb" + #elif defined(CONFIG_MX6Q) +@@ -111,11 +107,14 @@ "image=zImage\0" \ "console=ttymxc0\0" \ "splashpos=m,m\0" \ - "fdt_high=0xffffffff\0" \ - "initrd_high=0xffffffff\0" \ -+ "fdt_high=0xa0000000\0" \ -+ "initrd_high=0xa0000000\0" \ - "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \ +- "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \ - "fdt_addr=0x18000000\0" \ ++ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ + "fdt_addr_r=0x18000000\0" \ "boot_fdt=try\0" \ + "pxefile_addr_r=0x17f00000\0" \ + "scriptaddr=0x17e00000\0" \ + "kernel_addr_r=0x11000000\0" \ + "ramdisk_addr_r=0x18100000\0" \ ++ "bootm_size=0x20000000\0" \ "ip_dyn=yes\0" \ "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \ "mmcpart=1\0" \ -@@ -134,70 +134,12 @@ +@@ -134,70 +133,12 @@ "mmc write ${loadaddr} 0x2 ${fw_sz}; " \ "fi; " \ "fi\0" \ @@ -140,7 +144,7 @@ index 6c74c72..6aaa439 100644 #define CONFIG_SYS_CBSIZE 256 /* Print Buffer Size */ -@@ -207,8 +149,6 @@ +@@ -207,8 +148,6 @@ #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR @@ -149,7 +153,7 @@ index 6c74c72..6aaa439 100644 /* Physical Memory Map */ #define CONFIG_NR_DRAM_BANKS 1 #define PHYS_SDRAM MMDC0_ARB_BASE_ADDR -@@ -231,9 +171,6 @@ +@@ -231,9 +170,6 @@ #define CONFIG_ENV_OFFSET (6 * 64 * 1024) #define CONFIG_SYS_MMC_ENV_DEV 0 diff --git a/0007-move-udoo-over-to-use-the-generic-distro-configuatio.patch b/0007-move-udoo-over-to-use-the-generic-distro-configuatio.patch new file mode 100644 index 0000000..ae94722 --- /dev/null +++ b/0007-move-udoo-over-to-use-the-generic-distro-configuatio.patch @@ -0,0 +1,168 @@ +From 48eb6e1d1daf48f333dbb3210dc9866afecf9c38 Mon Sep 17 00:00:00 2001 +From: Dennis Gilmore +Date: Mon, 21 Apr 2014 12:18:26 -0500 +Subject: [PATCH 07/14] move udoo over to use the generic distro configuation + and environment + +port udoo to use the generic distro configuation. +remove duplicated config options, clean up the environment, include new +environment. +--- + include/configs/udoo.h | 74 ++++++++++++-------------------------------------- + 1 file changed, 18 insertions(+), 56 deletions(-) + +diff --git a/include/configs/udoo.h b/include/configs/udoo.h +index a0306de..75e24d5 100644 +--- a/include/configs/udoo.h ++++ b/include/configs/udoo.h +@@ -49,10 +49,6 @@ + + /* Network support */ + +-#define CONFIG_CMD_PING +-#define CONFIG_CMD_DHCP +-#define CONFIG_CMD_MII +-#define CONFIG_CMD_NET + #define CONFIG_FEC_MXC + #define CONFIG_MII + #define IMX_FEC_BASE ENET_BASE_ADDR +@@ -76,7 +72,6 @@ + #define CONFIG_CMD_BMODE + #define CONFIG_CMD_SETEXPR + +-#define CONFIG_BOOTDELAY 3 + + #define CONFIG_SYS_MEMTEST_START 0x10000000 + #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 500 * SZ_1M) +@@ -92,9 +87,10 @@ + #define CONFIG_CMD_MMC + #define CONFIG_GENERIC_MMC + #define CONFIG_BOUNCE_BUFFER +-#define CONFIG_CMD_EXT2 +-#define CONFIG_CMD_FAT +-#define CONFIG_DOS_PARTITION ++ ++#ifndef CONFIG_SPL_BUILD ++#include ++#include + + #define CONFIG_DEFAULT_FDT_FILE "imx6q-udoo.dtb" + +@@ -103,15 +99,16 @@ + "image=zImage\0" \ + "console=ttymxc1\0" \ + "splashpos=m,m\0" \ +- "fdt_high=0xffffffff\0" \ +- "initrd_high=0xffffffff\0" \ + "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \ +- "fdt_addr=0x18000000\0" \ + "boot_fdt=try\0" \ ++ "kernel_addr_r=0x11000000\0" \ ++ "scriptaddr=0x17e00000\0" \ ++ "pxefile_addr_r=0x17f00000\0" \ ++ "fdt_addr_r=0x18000000\0" \ ++ "ramdisk_addr_r=0x18100000\0" \ ++ "bootm_size=0x20000000\0" \ + "ip_dyn=yes\0" \ + "mmcdev=0\0" \ +- "mmcpart=1\0" \ +- "mmcroot=/dev/mmcblk0p2 rootwait rw\0" \ + "update_sd_firmware_filename=u-boot.imx\0" \ + "update_sd_firmware=" \ + "if test ${ip_dyn} = yes; then " \ +@@ -123,32 +120,9 @@ + "if ${get_cmd} ${update_sd_firmware_filename}; then " \ + "setexpr fw_sz ${filesize} / 0x200; " \ + "setexpr fw_sz ${fw_sz} + 1; " \ +- "mmc write ${loadaddr} 0x2 ${fw_sz}; " \ ++ "mmc write ${kernel_addr_r} 0x2 ${fw_sz}; " \ + "fi; " \ + "fi\0" \ +- "mmcargs=setenv bootargs console=${console},${baudrate} " \ +- "root=${mmcroot}\0" \ +- "loadbootscript=" \ +- "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \ +- "bootscript=echo Running bootscript from mmc ...; " \ +- "source\0" \ +- "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \ +- "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \ +- "mmcboot=echo Booting from mmc ...; " \ +- "run mmcargs; " \ +- "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ +- "if run loadfdt; then " \ +- "bootz ${loadaddr} - ${fdt_addr}; " \ +- "else " \ +- "if test ${boot_fdt} = try; then " \ +- "bootz; " \ +- "else " \ +- "echo WARN: Cannot load the DT; " \ +- "fi; " \ +- "fi; " \ +- "else " \ +- "bootz; " \ +- "fi;\0" \ + "netargs=setenv bootargs console=${console},${baudrate} " \ + "root=/dev/nfs " \ + "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \ +@@ -161,8 +135,8 @@ + "fi; " \ + "${get_cmd} ${image}; " \ + "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ +- "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \ +- "bootz ${loadaddr} - ${fdt_addr}; " \ ++ "if ${get_cmd} ${fdt_addr_r} ${fdt_file}; then " \ ++ "bootz ${kernel_addr_r} - ${fdt_addr_r}; " \ + "else " \ + "if test ${boot_fdt} = try; then " \ + "bootz; " \ +@@ -172,25 +146,16 @@ + "fi; " \ + "else " \ + "bootz; " \ +- "fi;\0" ++ "fi;\0" \ ++ BOOTCMDS_COMMON + + #define CONFIG_BOOTCOMMAND \ +- "mmc dev ${mmcdev}; if mmc rescan; then " \ +- "if run loadbootscript; then " \ +- "run bootscript; " \ +- "else " \ +- "if run loadimage; then " \ +- "run mmcboot; " \ +- "else run netboot; " \ +- "fi; " \ +- "fi; " \ +- "else run netboot; fi" ++ "for target in ${boot_targets}; do run bootcmd_${target}; done ;" \ ++ "run netboot;" ++#endif + + /* Miscellaneous configurable options */ +-#define CONFIG_SYS_LONGHELP +-#define CONFIG_SYS_HUSH_PARSER + #define CONFIG_SYS_PROMPT "=> " +-#define CONFIG_AUTO_COMPLETE + #define CONFIG_SYS_CBSIZE 256 + + /* Print Buffer Size */ +@@ -200,7 +165,6 @@ + + #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR + +-#define CONFIG_CMDLINE_EDITING + + /* Physical Memory Map */ + #define CONFIG_NR_DRAM_BANKS 1 +@@ -224,8 +188,6 @@ + #define CONFIG_ENV_OFFSET (6 * 64 * 1024) + #define CONFIG_SYS_MMC_ENV_DEV 0 + +-#define CONFIG_OF_LIBFDT +-#define CONFIG_CMD_BOOTZ + + #ifndef CONFIG_SYS_DCACHE_OFF + #define CONFIG_CMD_CACHE +-- +1.9.0 + diff --git a/0008-convert-pandaboard-to-use-generic-boot-commands.patch b/0008-move-pandaboard-over-to-use-the-generic-distro-confi.patch similarity index 67% rename from 0008-convert-pandaboard-to-use-generic-boot-commands.patch rename to 0008-move-pandaboard-over-to-use-the-generic-distro-confi.patch index 2286959..02dc899 100644 --- a/0008-convert-pandaboard-to-use-generic-boot-commands.patch +++ b/0008-move-pandaboard-over-to-use-the-generic-distro-confi.patch @@ -1,34 +1,62 @@ -From 1afa628d19c3ab8bb4059f9d8af34b897cca8a12 Mon Sep 17 00:00:00 2001 +From b46336f269ee46536322315706b27c00f02e06c5 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore -Date: Sat, 15 Mar 2014 10:26:49 -0500 -Subject: [PATCH 08/13] convert pandaboard to use generic boot commands +Date: Mon, 21 Apr 2014 12:23:10 -0500 +Subject: [PATCH 08/14] move pandaboard over to use the generic distro + configuation and environment +port pandaboard to use the generic distro configuation. +remove duplicated config options, clean up the environment, include new +environment. --- - include/configs/omap4_panda.h | 3 --- - include/configs/ti_omap4_common.h | 34 ++++++++-------------------------- - 2 files changed, 8 insertions(+), 29 deletions(-) + include/configs/omap4_panda.h | 4 ---- + include/configs/ti_omap4_common.h | 46 +++++++++++++++++---------------------- + 2 files changed, 20 insertions(+), 30 deletions(-) diff --git a/include/configs/omap4_panda.h b/include/configs/omap4_panda.h -index 7378acd..26f7aee 100644 +index 7378acd..9c5f6e1 100644 --- a/include/configs/omap4_panda.h +++ b/include/configs/omap4_panda.h -@@ -33,11 +33,8 @@ +@@ -33,11 +33,7 @@ #define CONFIG_UBOOT_ENABLE_PADS_ALL -#define CONFIG_CMD_PING -#define CONFIG_CMD_DHCP - +- #include -#define CONFIG_CMD_NET /* GPIO */ #define CONFIG_CMD_GPIO diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h -index 387f570..a92e681 100644 +index 387f570..88b0264 100644 --- a/include/configs/ti_omap4_common.h +++ b/include/configs/ti_omap4_common.h -@@ -102,16 +102,16 @@ +@@ -56,6 +56,15 @@ + #include + + /* ++ * * Include the generic config options and boot environment when not ++ * * building our SPL ++ * */ ++#ifndef CONFIG_SPL_BUILD ++#include ++#include ++#endif ++ ++/* + * Hardware drivers + */ + #define CONFIG_SYS_NS16550 +@@ -86,6 +95,7 @@ + /* + * Environment setup + */ ++#ifndef CONFIG_SPL_BUILD + #define CONFIG_EXTRA_ENV_SETTINGS \ + DEFAULT_LINUX_BOOT_ENV \ + "console=ttyO2,115200n8\0" \ +@@ -102,16 +112,16 @@ "vram=${vram} " \ "root=${mmcroot} " \ "rootfstype=${mmcrootfstype}\0" \ @@ -51,12 +79,14 @@ index 387f570..a92e681 100644 "findfdt="\ "if test $board_name = sdp4430; then " \ "setenv fdtfile omap4-sdp.dtb; fi; " \ -@@ -123,29 +123,11 @@ +@@ -123,29 +133,13 @@ "setenv fdtfile omap4-panda-es.dtb; fi;" \ "if test $fdtfile = undefined; then " \ "echo WARNING: Could not determine device tree to use; fi; \0" \ - "loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \ + "loadfdt=load mmc ${bootpart} ${fdt_addr_r} ${bootdir}/${fdtfile}\0" \ ++ BOOTCMDS_COMMON ++#endif #define CONFIG_BOOTCOMMAND \ "run findfdt; " \ @@ -79,7 +109,7 @@ index 387f570..a92e681 100644 - "fi; " \ - "fi" - -+ for target in ${boot_targets}; do run bootcmd_${target}; done ++ "for target in ${boot_targets}; do run bootcmd_${target}; done " /* * Defines for SPL * It is known that this will break HS devices. Since the current size of diff --git a/0009-fix-up-some-sillies.patch b/0009-fix-up-some-sillies.patch deleted file mode 100644 index 0544121..0000000 --- a/0009-fix-up-some-sillies.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 5b08e934e4e76f434297fc6de11764a615bc65ab Mon Sep 17 00:00:00 2001 -From: Dennis Gilmore -Date: Sat, 15 Mar 2014 11:52:33 -0500 -Subject: [PATCH 09/13] fix up some sillies - ---- - include/config_distro_bootcmd.h | 8 ++++---- - include/configs/omap4_panda.h | 1 + - include/configs/ti_armv7_common.h | 2 ++ - include/configs/ti_omap4_common.h | 2 +- - 4 files changed, 8 insertions(+), 5 deletions(-) - -diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h -index bf44734..0fe94be 100644 ---- a/include/config_distro_bootcmd.h -+++ b/include/config_distro_bootcmd.h -@@ -42,7 +42,7 @@ - "run scan_boot; " \ - "fi\0" \ - \ -- "bootcmd_usb0=setenv devnum 0; run usb_boot;\0" -+ "bootcmd_usb0=setenv devnum 0; run usb_boot;\0" \ - "bootcmd_usb1=setenv devnum 1; run usb_boot;\0" - #define BOOT_TARGETS_USB "usb0 usb1" - #else -@@ -59,7 +59,7 @@ - "run scan_boot; " \ - "fi\0" \ - \ -- "bootcmd_sata0=setenv devnum 0; run sata_boot;\0" -+ "bootcmd_sata0=setenv devnum 0; run sata_boot;\0" \ - "bootcmd_sata1=setenv devnum 1; run sata_boot;\0" - #define BOOT_TARGETS_SATA "sata0 sata1" - #else -@@ -75,7 +75,7 @@ - "run scan_boot; " \ - "fi\0" \ - \ -- "bootcmd_scsi0=setenv devnum 0; run scsi_boot;\0" -+ "bootcmd_scsi0=setenv devnum 0; run scsi_boot;\0" \ - "bootcmd_scsi1=setenv devnum 1; run scsi_boot;\0" - #define BOOT_TARGETS_SCSI "scsi0 scsi1" - #else -@@ -91,7 +91,7 @@ - "run scan_boot; " \ - "fi\0" \ - \ -- "bootcmd_ide0=setenv devnum 0; run ide_boot;\0" -+ "bootcmd_ide0=setenv devnum 0; run ide_boot;\0" \ - "bootcmd_ide1=setenv devnum 1; run ide_boot;\0" - #define BOOT_TARGETS_IDE "ide0 ide1" - #else -diff --git a/include/configs/omap4_panda.h b/include/configs/omap4_panda.h -index 26f7aee..1b81a24 100644 ---- a/include/configs/omap4_panda.h -+++ b/include/configs/omap4_panda.h -@@ -35,6 +35,7 @@ - - - #include -+#define CONFIG_CMD_NET - - /* GPIO */ - #define CONFIG_CMD_GPIO -diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h -index 79af66e..96c6bd0 100644 ---- a/include/configs/ti_armv7_common.h -+++ b/include/configs/ti_armv7_common.h -@@ -169,6 +169,8 @@ - #include - #endif - -+#define CONFIG_CMD_FAT -+ - /* - * Our platforms make use of SPL to initalize the hardware (primarily - * memory) enough for full U-Boot to be loaded. We also support Falcon -diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h -index a92e681..eb3240a 100644 ---- a/include/configs/ti_omap4_common.h -+++ b/include/configs/ti_omap4_common.h -@@ -127,7 +127,7 @@ - - #define CONFIG_BOOTCOMMAND \ - "run findfdt; " \ -- for target in ${boot_targets}; do run bootcmd_${target}; done -+ "for target in ${boot_targets}; do run bootcmd_${target}; done" - /* - * Defines for SPL - * It is known that this will break HS devices. Since the current size of --- -1.9.0 - diff --git a/0007-convert-beaglebone-to-use-generic-boot-commands.patch b/0009-move-beaglebone-over-to-use-the-generic-distro-confi.patch similarity index 56% rename from 0007-convert-beaglebone-to-use-generic-boot-commands.patch rename to 0009-move-beaglebone-over-to-use-the-generic-distro-confi.patch index 038fe8b..49ff099 100644 --- a/0007-convert-beaglebone-to-use-generic-boot-commands.patch +++ b/0009-move-beaglebone-over-to-use-the-generic-distro-confi.patch @@ -1,18 +1,37 @@ -From f602391354fdfc12c15e06e45fbf1b40c590f008 Mon Sep 17 00:00:00 2001 +From c541b9036bccc359f13c73924e6ee2f837daaa55 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore -Date: Sat, 15 Mar 2014 10:24:26 -0500 -Subject: [PATCH 07/13] convert beaglebone to use generic boot commands +Date: Mon, 21 Apr 2014 12:27:22 -0500 +Subject: [PATCH 09/14] move beaglebone over to use the generic distro + configuation and environment +port beaglebone to use the generic distro configuation. +remove duplicated config options, clean up the environment, include new +environment. --- - include/configs/am335x_evm.h | 62 +++++++++------------------------------ - include/configs/ti_armv7_common.h | 30 +++++-------------- - 2 files changed, 21 insertions(+), 71 deletions(-) + include/configs/am335x_evm.h | 71 ++++++++++++++------------------------------ + 1 file changed, 23 insertions(+), 48 deletions(-) diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h -index 11088b3..a291a2f 100644 +index ebe2ab3..a874c7d 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h -@@ -50,9 +50,9 @@ +@@ -18,6 +18,15 @@ + + #include + ++/* ++ * * Include the generic config options and boot environment when not ++ * * building our SPL ++ * */ ++#ifndef CONFIG_SPL_BUILD ++#include ++#include ++#endif ++ + #define MACH_TYPE_TIAM335EVM 3589 /* Until the next sync */ + #define CONFIG_MACH_TYPE MACH_TYPE_TIAM335EVM + #define CONFIG_BOARD_LATE_INIT +@@ -50,9 +59,9 @@ "nandrootfstype=ubifs rootwait=1\0" \ "nandboot=echo Booting from nand ...; " \ "run nandargs; " \ @@ -25,7 +44,7 @@ index 11088b3..a291a2f 100644 #else #define NANDARGS "" #endif -@@ -100,60 +100,28 @@ +@@ -100,60 +109,28 @@ "nfsroot=${serverip}:${rootpath},${nfsopts} rw " \ "ip=dhcp\0" \ "bootenv=uEnv.txt\0" \ @@ -94,7 +113,7 @@ index 11088b3..a291a2f 100644 "findfdt="\ "if test $board_name = A335BONE; then " \ "setenv fdtfile am335x-bone.dtb; fi; " \ -@@ -166,15 +134,13 @@ +@@ -166,15 +143,13 @@ "if test $fdtfile = undefined; then " \ "echo WARNING: Could not determine device tree to use; fi; \0" \ NANDARGS \ @@ -109,88 +128,10 @@ index 11088b3..a291a2f 100644 - "setenv mmcdev 1; " \ - "setenv bootpart 1:2; " \ - "run mmcboot;" \ -+ "for target in ${boot_targets}; do run bootcmd_${target}; done" \ ++ "for target in ${boot_targets}; do run bootcmd_${target}; done ;" \ "run nandboot;" /* NS16550 Configuration */ -diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h -index fda99fb..79af66e 100644 ---- a/include/configs/ti_armv7_common.h -+++ b/include/configs/ti_armv7_common.h -@@ -28,7 +28,6 @@ - #define CONFIG_SYS_NO_FLASH - - /* Support both device trees and ATAGs. */ --#define CONFIG_OF_LIBFDT - #define CONFIG_CMDLINE_TAG - #define CONFIG_SETUP_MEMORY_TAGS - #define CONFIG_INITRD_TAG -@@ -53,6 +52,8 @@ - #define DEFAULT_LINUX_BOOT_ENV \ - "loadaddr=0x82000000\0" \ - "kernel_addr_r=0x82000000\0" \ -+ "pxe_addr_r=0x87F00000\0" \ -+ "scriptaddr=0x87E00000\0" \ - "fdtaddr=0x88000000\0" \ - "fdt_addr_r=0x88000000\0" \ - "rdaddr=0x88080000\0" \ -@@ -60,11 +61,6 @@ - "bootm_size=0x20000000\0" - - /* -- * Default to a quick boot delay. -- */ --#define CONFIG_BOOTDELAY 1 -- --/* - * DDR information. If the CONFIG_NR_DRAM_BANKS is not defined, - * we say (for simplicity) that we have 1 bank, always, even when - * we have more. We always start at 0x80000000, and we place the -@@ -125,19 +121,12 @@ - * console baudrate of 115200 and use the default baud rate table. - */ - #define CONFIG_SYS_MALLOC_LEN (1024 << 10) --#define CONFIG_SYS_HUSH_PARSER - #define CONFIG_SYS_PROMPT "U-Boot# " - #define CONFIG_SYS_CONSOLE_INFO_QUIET - #define CONFIG_BAUDRATE 115200 - #define CONFIG_ENV_VARS_UBOOT_CONFIG /* Strongly encouraged */ - #define CONFIG_ENV_OVERWRITE /* Overwrite ethaddr / serial# */ - --/* As stated above, the following choices are optional. */ --#define CONFIG_SYS_LONGHELP --#define CONFIG_AUTO_COMPLETE --#define CONFIG_CMDLINE_EDITING --#define CONFIG_VERSION_VARIABLE -- - /* We set the max number of command args high to avoid HUSH bugs. */ - #define CONFIG_SYS_MAXARGS 64 - -@@ -170,19 +159,14 @@ - #include - #define CONFIG_CMD_ASKENV - #define CONFIG_CMD_ECHO --#define CONFIG_CMD_BOOTZ - - /* -- * Common filesystems support. When we have removable storage we -- * enabled a number of useful commands and support. -+ * Include the generic config options and boot environment when not -+ * building our SPL - */ --#if defined(CONFIG_MMC) || defined(CONFIG_USB_STORAGE) --#define CONFIG_DOS_PARTITION --#define CONFIG_CMD_FAT --#define CONFIG_FAT_WRITE --#define CONFIG_CMD_EXT2 --#define CONFIG_CMD_EXT4 --#define CONFIG_CMD_FS_GENERIC -+#ifndef CONFIG_SPL_BUILD -+#include -+#include - #endif - - /* -- 1.9.0 diff --git a/0005-add-generic-bootcmd-header.patch b/0010-add-header-with-a-generic-set-of-boot-commands-defin.patch similarity index 84% rename from 0005-add-generic-bootcmd-header.patch rename to 0010-add-header-with-a-generic-set-of-boot-commands-defin.patch index 04963eb..2a62b65 100644 --- a/0005-add-generic-bootcmd-header.patch +++ b/0010-add-header-with-a-generic-set-of-boot-commands-defin.patch @@ -1,19 +1,27 @@ -From a25d030a4cea61e7ea08cf3175c886cc1959526e Mon Sep 17 00:00:00 2001 +From 99b529d14da75487600043d3f0c209d1c54d14e9 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore -Date: Sat, 15 Mar 2014 10:13:39 -0500 -Subject: [PATCH 05/13] add generic bootcmd header +Date: Mon, 21 Apr 2014 12:29:04 -0500 +Subject: [PATCH 10/14] add header with a generic set of boot commands defined. +As the next step in a generic config we are introducing a set of generic boot +paramaters. Depending on the hardwares configuration, booting from supported +hardware will be enabled, mmc, usb, sata, scsi, ide, pxe and dhcp. + +There is nothing to stop this being extended to support nand and any other +type of storage that comes along. An ideal future enhancement will be to +allow the user to dynamically reorder the boot devices, and allow one off +boots. for example simply be able to pxe boot to reinstall --- - include/config_distro_bootcmd.h | 208 ++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 208 insertions(+) + include/config_distro_bootcmd.h | 209 ++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 209 insertions(+) create mode 100644 include/config_distro_bootcmd.h diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h new file mode 100644 -index 0000000..bf44734 +index 0000000..f0620ff --- /dev/null +++ b/include/config_distro_bootcmd.h -@@ -0,0 +1,208 @@ +@@ -0,0 +1,209 @@ +/* + * (C) Copyright 2014 + * NVIDIA Corporation @@ -36,7 +44,8 @@ index 0000000..bf44734 + "fi\0" \ + "bootcmd_mmc0=setenv devnum 0; run mmc_boot;\0" \ + "bootcmd_mmc1=setenv devnum 1; run mmc_boot;\0" -+#define BOOT_TARGETS_MMC "mmc1 mmc0" ++ "bootcmd_mmc2=setenv devnum 2; run mmc_boot;\0" ++#define BOOT_TARGETS_MMC "mmc2 mmc1 mmc0" +#else +#define BOOTCMDS_MMC "" +#define BOOT_TARGETS_MMC "" @@ -58,7 +67,7 @@ index 0000000..bf44734 + "run scan_boot; " \ + "fi\0" \ + \ -+ "bootcmd_usb0=setenv devnum 0; run usb_boot;\0" ++ "bootcmd_usb0=setenv devnum 0; run usb_boot;\0" \ + "bootcmd_usb1=setenv devnum 1; run usb_boot;\0" +#define BOOT_TARGETS_USB "usb0 usb1" +#else @@ -75,7 +84,7 @@ index 0000000..bf44734 + "run scan_boot; " \ + "fi\0" \ + \ -+ "bootcmd_sata0=setenv devnum 0; run sata_boot;\0" ++ "bootcmd_sata0=setenv devnum 0; run sata_boot;\0" \ + "bootcmd_sata1=setenv devnum 1; run sata_boot;\0" +#define BOOT_TARGETS_SATA "sata0 sata1" +#else @@ -91,7 +100,7 @@ index 0000000..bf44734 + "run scan_boot; " \ + "fi\0" \ + \ -+ "bootcmd_scsi0=setenv devnum 0; run scsi_boot;\0" ++ "bootcmd_scsi0=setenv devnum 0; run scsi_boot;\0" \ + "bootcmd_scsi1=setenv devnum 1; run scsi_boot;\0" +#define BOOT_TARGETS_SCSI "scsi0 scsi1" +#else @@ -107,7 +116,7 @@ index 0000000..bf44734 + "run scan_boot; " \ + "fi\0" \ + \ -+ "bootcmd_ide0=setenv devnum 0; run ide_boot;\0" ++ "bootcmd_ide0=setenv devnum 0; run ide_boot;\0" \ + "bootcmd_ide1=setenv devnum 1; run ide_boot;\0" +#define BOOT_TARGETS_IDE "ide0 ide1" +#else diff --git a/0010-fixups-for-wandboard-to-ensure-the-environment-is-co.patch b/0010-fixups-for-wandboard-to-ensure-the-environment-is-co.patch deleted file mode 100644 index 806815b..0000000 --- a/0010-fixups-for-wandboard-to-ensure-the-environment-is-co.patch +++ /dev/null @@ -1,59 +0,0 @@ -From e0c237a890aa404caf941c8f5e05c9748a7e8344 Mon Sep 17 00:00:00 2001 -From: Dennis Gilmore -Date: Mon, 17 Mar 2014 10:30:41 -0500 -Subject: [PATCH 10/13] fixups for wandboard to ensure the environment is - correct - ---- - include/configs/wandboard.h | 15 +++++++-------- - 1 file changed, 7 insertions(+), 8 deletions(-) - -diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h -index 6aaa439..386fe78 100644 ---- a/include/configs/wandboard.h -+++ b/include/configs/wandboard.h -@@ -41,11 +41,6 @@ - #define CONFIG_CONS_INDEX 1 - #define CONFIG_BAUDRATE 115200 - --#ifndef CONFIG_SPL_BUILD --#include --#include --#endif -- - /* Command definition */ - #include - -@@ -96,6 +91,11 @@ - #define CONFIG_IPUV3_CLK 260000000 - #define CONFIG_IMX_HDMI - -+#ifndef CONFIG_SPL_BUILD -+#include -+#include -+#endif -+ - #if defined(CONFIG_MX6DL) || defined(CONFIG_MX6S) - #define CONFIG_DEFAULT_FDT_FILE "imx6dl-wandboard.dtb" - #elif defined(CONFIG_MX6Q) -@@ -107,15 +107,14 @@ - "image=zImage\0" \ - "console=ttymxc0\0" \ - "splashpos=m,m\0" \ -- "fdt_high=0xa0000000\0" \ -- "initrd_high=0xa0000000\0" \ -- "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \ -+ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ - "fdt_addr_r=0x18000000\0" \ - "boot_fdt=try\0" \ - "pxefile_addr_r=0x17f00000\0" \ - "scriptaddr=0x17e00000\0" \ - "kernel_addr_r=0x11000000\0" \ - "ramdisk_addr_r=0x18100000\0" \ -+ "bootm_size=0x20000000\0" \ - "ip_dyn=yes\0" \ - "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \ - "mmcpart=1\0" \ --- -1.9.0 - diff --git a/0004-add-README.distro.patch b/0011-add-README.distro-file.patch similarity index 87% rename from 0004-add-README.distro.patch rename to 0011-add-README.distro-file.patch index e89be24..a7bdfa0 100644 --- a/0004-add-README.distro.patch +++ b/0011-add-README.distro-file.patch @@ -1,10 +1,11 @@ -From 2e52b4b057bf022f00da378186ae9a5a0b6dba13 Mon Sep 17 00:00:00 2001 +From 92e9920fc35a3e53ab1fdf3ad934e951c597e7c2 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore -Date: Sat, 8 Mar 2014 10:42:34 -0600 -Subject: [PATCH 04/13] add README.distro +Date: Mon, 21 Apr 2014 12:29:49 -0500 +Subject: [PATCH 11/14] add README.distro file -Add instructions on how to setup a system to boot using the generic boot -framework. +Add documentation on how to setup a system to use the generic distro +configs and boot commands. This spells out what is needed to make a +system conformant, but does not limit the board to only the defaults. --- doc/README.distro | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) @@ -12,7 +13,7 @@ framework. diff --git a/doc/README.distro b/doc/README.distro new file mode 100644 -index 0000000..a4b50b5 +index 0000000..435c578 --- /dev/null +++ b/doc/README.distro @@ -0,0 +1,76 @@ @@ -88,7 +89,7 @@ index 0000000..a4b50b5 +------------------- +in the most simplest form CONFIG_BOOTCOMMAND just needs one line + -+"for target in ${boot_targets}; do run bootcmd_${target}; done" ++"for target in ${boot_targets}; do run bootcmd_${target}; done " + +you can run any setup before going through the targets for example run a +command to set "fdtfile" variable for the dtb for your board. diff --git a/0011-convert-fdt_file-to-fdtfile-globally.patch b/0011-convert-fdt_file-to-fdtfile-globally.patch deleted file mode 100644 index 4d2b596..0000000 --- a/0011-convert-fdt_file-to-fdtfile-globally.patch +++ /dev/null @@ -1,738 +0,0 @@ -From e3a1ae5aa03d5d3e4dd4e7981f44f06eb851f83e Mon Sep 17 00:00:00 2001 -From: Dennis Gilmore -Date: Mon, 17 Mar 2014 10:45:14 -0500 -Subject: [PATCH 11/13] convert fdt_file to fdtfile globally - -cmd_pxe.c requires that the veriable for the fdt file name be called -fdtfile. Some boards are using fdt_file so this patch converts them -all to fdtfile. thei will enable any board to be converted to using -the generic framework in development ---- - include/configs/PMC440.h | 4 ++-- - include/configs/TQM5200.h | 4 ++-- - include/configs/TQM834x.h | 2 +- - include/configs/alpr.h | 4 ++-- - include/configs/amcc-common.h | 6 +++--- - include/configs/cgtqmx6eval.h | 4 ++-- - include/configs/charon.h | 2 +- - include/configs/cm5200.h | 4 ++-- - include/configs/digsy_mtc.h | 2 +- - include/configs/enbw_cmc.h | 4 ++-- - include/configs/hummingboard.h | 6 +++--- - include/configs/manroland/common.h | 4 ++-- - include/configs/motionpro.h | 6 +++--- - include/configs/muas3001.h | 8 ++++---- - include/configs/mx23_olinuxino.h | 6 +++--- - include/configs/mx23evk.h | 4 ++-- - include/configs/mx28evk.h | 8 ++++---- - include/configs/mx51evk.h | 6 +++--- - include/configs/mx53ard.h | 6 +++--- - include/configs/mx53loco.h | 6 +++--- - include/configs/mx6sabre_common.h | 6 +++--- - include/configs/mx6slevk.h | 6 +++--- - include/configs/nitrogen6x.h | 6 +++--- - include/configs/o2dnt-common.h | 4 ++-- - include/configs/socrates.h | 6 +++--- - include/configs/udoo.h | 6 +++--- - include/configs/vf610twr.h | 6 +++--- - 27 files changed, 68 insertions(+), 68 deletions(-) - -diff --git a/include/configs/PMC440.h b/include/configs/PMC440.h -index c5e2f16..53d0385 100644 ---- a/include/configs/PMC440.h -+++ b/include/configs/PMC440.h -@@ -200,7 +200,7 @@ - #define CONFIG_EXTRA_ENV_SETTINGS \ - CONFIG_SYS_BOOTFILE \ - CONFIG_SYS_ROOTPATH \ -- "fdt_file=/tftpboot/pmc440/pmc440.dtb\0" \ -+ "fdtfile=/tftpboot/pmc440/pmc440.dtb\0" \ - "netdev=eth0\0" \ - "ethrotate=no\0" \ - "nfsargs=setenv bootargs root=/dev/nfs rw " \ -@@ -215,7 +215,7 @@ - "nand_boot_fdt=run nandargs addip addtty addmisc;" \ - "bootm ${kernel_addr} - ${fdt_addr}\0" \ - "net_nfs_fdt=tftp ${kernel_addr_r} ${bootfile};" \ -- "tftp ${fdt_addr_r} ${fdt_file};" \ -+ "tftp ${fdt_addr_r} ${fdtfile};" \ - "run nfsargs addip addtty addmisc;" \ - "bootm ${kernel_addr_r} - ${fdt_addr_r}\0" \ - "kernel_addr=ffc00000\0" \ -diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h -index 69c0336..db32819 100644 ---- a/include/configs/TQM5200.h -+++ b/include/configs/TQM5200.h -@@ -241,7 +241,7 @@ - #define CUSTOM_ENV_SETTINGS \ - "hostname=tqm5200\0" \ - "bootfile=/tftpboot/tqm5200/uImage\0" \ -- "fdt_file=/tftpboot/tqm5200/tqm5200.dtb\0" \ -+ "fdtfile=/tftpboot/tqm5200/tqm5200.dtb\0" \ - "u-boot=/tftpboot/tqm5200/u-boot.bin\0" - #elif defined(CONFIG_CAM5200) - #define CUSTOM_ENV_SETTINGS \ -@@ -295,7 +295,7 @@ - "net_nfs_old=tftp ${kernel_addr_r} ${bootfile};" \ - "sete console ttyS0; run nfsargs addip addcons;bootm\0" \ - "net_nfs=tftp ${kernel_addr_r} ${bootfile}; " \ -- "tftp ${fdt_addr_r} ${fdt_file}; " \ -+ "tftp ${fdt_addr_r} ${fdtfile}; " \ - "run nfsargs addip addcons addmtd; " \ - "bootm ${kernel_addr_r} - ${fdt_addr_r}\0" \ - CUSTOM_ENV_SETTINGS \ -diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h -index 6762e3a..1e23d95 100644 ---- a/include/configs/TQM834x.h -+++ b/include/configs/TQM834x.h -@@ -535,7 +535,7 @@ - "net_nfs_old=tftp 400000 ${bootfile};" \ - "run nfsargs addip addcons;bootm\0" \ - "net_nfs=tftp ${kernel_addr_r} ${bootfile}; " \ -- "tftp ${fdt_addr_r} ${fdt_file}; " \ -+ "tftp ${fdt_addr_r} ${fdtfile}; " \ - "run nfsargs addip addcons; " \ - "bootm ${kernel_addr_r} - ${fdt_addr_r}\0" \ - "rootpath=/opt/eldk/ppc_6xx\0" \ -diff --git a/include/configs/alpr.h b/include/configs/alpr.h -index 7849b22..af43e8e 100644 ---- a/include/configs/alpr.h -+++ b/include/configs/alpr.h -@@ -132,7 +132,7 @@ - #define CONFIG_EXTRA_ENV_SETTINGS \ - "netdev=eth3\0" \ - "hostname=alpr\0" \ -- "fdt_file=alpr/alpr.dtb\0" \ -+ "fdtfile=alpr/alpr.dtb\0" \ - "fdt_addr=400000\0" \ - "nfsargs=setenv bootargs root=/dev/nfs rw " \ - "nfsroot=${serverip}:${rootpath} ${init}\0" \ -@@ -149,7 +149,7 @@ - "net_nfs=tftp 200000 ${bootfile};run nfsargs addip addtty;" \ - "bootm\0" \ - "net_nfs_fdt=tftp 200000 ${bootfile};" \ -- "tftp ${fdt_addr} ${fdt_file};" \ -+ "tftp ${fdt_addr} ${fdtfile};" \ - "run nfsargs addip addtty;" \ - "bootm 200000 - ${fdt_addr}\0" \ - "rootpath=/opt/projects/alpr/nfs_root\0" \ -diff --git a/include/configs/amcc-common.h b/include/configs/amcc-common.h -index 2aea899..95d42ac 100644 ---- a/include/configs/amcc-common.h -+++ b/include/configs/amcc-common.h -@@ -208,16 +208,16 @@ - "flash_nfs=run nfsargs addip addtty addmisc;" \ - "bootm ${kernel_addr} - ${fdt_addr}\0" \ - "net_nfs=tftp ${kernel_addr_r} ${bootfile}; " \ -- "tftp ${fdt_addr_r} ${fdt_file}; " \ -+ "tftp ${fdt_addr_r} ${fdtfile}; " \ - "run nfsargs addip addtty addmisc;" \ - "bootm ${kernel_addr_r} - ${fdt_addr_r}\0" \ - "net_self_load=tftp ${kernel_addr_r} ${bootfile};" \ -- "tftp ${fdt_addr_r} ${fdt_file};" \ -+ "tftp ${fdt_addr_r} ${fdtfile};" \ - "tftp ${ramdisk_addr_r} ${ramdisk_file};\0" \ - "net_self=run net_self_load;" \ - "run ramargs addip addtty addmisc;" \ - "bootm ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr_r}\0" \ -- "fdt_file=" __stringify(CONFIG_HOSTNAME) "/" __stringify(CONFIG_HOSTNAME) ".dtb\0" -+ "fdtfile=" __stringify(CONFIG_HOSTNAME) "/" __stringify(CONFIG_HOSTNAME) ".dtb\0" - - /* - * Default environment for arch/ppc booting, -diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h -index b189bf1..dac7e65 100644 ---- a/include/configs/cgtqmx6eval.h -+++ b/include/configs/cgtqmx6eval.h -@@ -76,7 +76,7 @@ - #define CONFIG_EXTRA_ENV_SETTINGS \ - "script=boot.scr\0" \ - "image=zImage\0" \ -- "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \ -+ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ - "boot_dir=/boot\0" \ - "console=ttymxc1\0" \ - "fdt_high=0xffffffff\0" \ -@@ -95,7 +95,7 @@ - "loadimage=ext2load mmc ${mmcdev}:${mmcpart} ${loadaddr} " \ - "${boot_dir}/${image}\0" \ - "loadfdt=ext2load mmc ${mmcdev}:${mmcpart} ${fdt_addr} " \ -- "${boot_dir}/${fdt_file}\0" \ -+ "${boot_dir}/${fdtfile}\0" \ - "mmcboot=echo Booting from mmc ...; " \ - "run mmcargs; " \ - "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ -diff --git a/include/configs/charon.h b/include/configs/charon.h -index 2f537e0..dfcc01e 100644 ---- a/include/configs/charon.h -+++ b/include/configs/charon.h -@@ -29,7 +29,7 @@ - #undef CUSTOM_ENV_SETTINGS - #define CUSTOM_ENV_SETTINGS \ - "bootfile=/tftpboot/charon/uImage\0" \ -- "fdt_file=/tftpboot/charon/charon.dtb\0" \ -+ "fdtfile=/tftpboot/charon/charon.dtb\0" \ - "u-boot=/tftpboot/charon/u-boot.bin\0" \ - "mtdparts=" MTDPARTS_DEFAULT "\0" \ - "addmtd=setenv bootargs ${bootargs} ${mtdparts}\0" -diff --git a/include/configs/cm5200.h b/include/configs/cm5200.h -index 7c693d6..8c41892 100644 ---- a/include/configs/cm5200.h -+++ b/include/configs/cm5200.h -@@ -98,7 +98,7 @@ - "rootpath=/opt/eldk-4.1/ppc_6xx\0" \ - "u-boot=/tftpboot/cm5200/u-boot.bin\0" \ - "bootfile_fdt=/tftpboot/cm5200/uImage\0" \ -- "fdt_file=/tftpboot/cm5200/cm5200.dtb\0" \ -+ "fdtfile=/tftpboot/cm5200/cm5200.dtb\0" \ - "load=tftp ${u-boot_addr} ${u-boot}\0" \ - "update=prot off fc000000 +${filesize}; " \ - "era fc000000 +${filesize}; " \ -@@ -117,7 +117,7 @@ - "flash_flash=run flashargs addinit addip addcons;" \ - "bootm ${kernel_addr_flash} - ${fdt_addr_flash}\0" \ - "net_nfs_fdt=tftp ${kernel_addr} ${bootfile_fdt}; " \ -- "tftp ${fdt_addr} ${fdt_file}; run nfsargs addip " \ -+ "tftp ${fdt_addr} ${fdtfile}; run nfsargs addip " \ - "addcons; bootm ${kernel_addr} - ${fdt_addr}\0" \ - "" - #define CONFIG_BOOTCOMMAND "run flash_flash" -diff --git a/include/configs/digsy_mtc.h b/include/configs/digsy_mtc.h -index 2a8cb39..b012539 100644 ---- a/include/configs/digsy_mtc.h -+++ b/include/configs/digsy_mtc.h -@@ -223,7 +223,7 @@ - "addcons=setenv bootargs ${bootargs} console=${console},${baudrate}\0"\ - "rootpath=/opt/eldk/ppc_6xx\0" \ - "net_nfs=tftp ${kernel_addr_r} ${bootfile};" \ -- "tftp ${fdt_addr_r} ${fdt_file};" \ -+ "tftp ${fdt_addr_r} ${fdtfile};" \ - "run nfsargs addip addcons;" \ - "bootm ${kernel_addr_r} - ${fdt_addr_r}\0" \ - "load=tftp 200000 ${u-boot}\0" \ -diff --git a/include/configs/enbw_cmc.h b/include/configs/enbw_cmc.h -index 03b74a2..97fd539 100644 ---- a/include/configs/enbw_cmc.h -+++ b/include/configs/enbw_cmc.h -@@ -188,14 +188,14 @@ - "kernel_addr_r=c0700000\0" \ - "fdt_addr_r=c0600000\0" \ - "ramdisk_addr_r=c0b00000\0" \ -- "fdt_file=" __stringify(CONFIG_HOSTNAME) "/" \ -+ "fdtfile=" __stringify(CONFIG_HOSTNAME) "/" \ - __stringify(CONFIG_HOSTNAME) ".dtb\0" \ - "kernel_file=" __stringify(CONFIG_HOSTNAME) "/uImage \0" \ - "nand_ld_ramdsk=nand read ${ramdisk_addr_r} 320000 400000\0" \ - "nand_ld_kernel=nand read ${kernel_addr_r} 20000 300000\0" \ - "nand_ld_fdt=nand read ${fdt_addr_r} 0 2000\0" \ - "load_kernel=tftp ${kernel_addr_r} ${kernel_file}\0" \ -- "load_fdt=tftp ${fdt_addr_r} ${fdt_file}\0" \ -+ "load_fdt=tftp ${fdt_addr_r} ${fdtfile}\0" \ - "load_nand=run nand_ld_ramdsk nand_ld_kernel nand_ld_fdt\0" \ - "addcon=setenv bootargs ${bootargs} console=ttyS2," \ - "${baudrate}n8\0" \ -diff --git a/include/configs/hummingboard.h b/include/configs/hummingboard.h -index 2895523..0fd8f1d 100644 ---- a/include/configs/hummingboard.h -+++ b/include/configs/hummingboard.h -@@ -97,7 +97,7 @@ - "splashpos=m,m\0" \ - "fdt_high=0xffffffff\0" \ - "initrd_high=0xffffffff\0" \ -- "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \ -+ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ - "fdt_addr=0x18000000\0" \ - "boot_fdt=try\0" \ - "ip_dyn=yes\0" \ -@@ -125,7 +125,7 @@ - "bootscript=echo Running bootscript from mmc ...; " \ - "source\0" \ - "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \ -- "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \ -+ "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdtfile}\0" \ - "mmcboot=echo Booting from mmc ...; " \ - "run mmcargs; " \ - "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ -@@ -153,7 +153,7 @@ - "fi; " \ - "${get_cmd} ${image}; " \ - "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ -- "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \ -+ "if ${get_cmd} ${fdt_addr} ${fdtfile}; then " \ - "bootz ${loadaddr} - ${fdt_addr}; " \ - "else " \ - "if test ${boot_fdt} = try; then " \ -diff --git a/include/configs/manroland/common.h b/include/configs/manroland/common.h -index ab4a471..2295530 100644 ---- a/include/configs/manroland/common.h -+++ b/include/configs/manroland/common.h -@@ -72,10 +72,10 @@ - "rootpath=/opt/eldk/ppc_82xx\0" \ - "kernel_addr_r=300000\0" \ - "fdt_addr_r=200000\0" \ -- "fdt_file=" __stringify(CONFIG_HOSTNAME) "/" \ -+ "fdtfile=" __stringify(CONFIG_HOSTNAME) "/" \ - __stringify(CONFIG_HOSTNAME) ".dtb\0" \ - "kernel_file=" __stringify(CONFIG_HOSTNAME) "/uImage \0" \ -- "load_fdt=tftp ${fdt_addr_r} ${fdt_file};\0" \ -+ "load_fdt=tftp ${fdt_addr_r} ${fdtfile};\0" \ - "load_kernel=tftp ${kernel_addr_r} ${kernel_file};\0" \ - "addcon=setenv bootargs ${bootargs} console=ttyPSC0,${baudrate}\0"\ - "net_nfs=run load_fdt load_kernel; " \ -diff --git a/include/configs/motionpro.h b/include/configs/motionpro.h -index e8b0593..0b52580 100644 ---- a/include/configs/motionpro.h -+++ b/include/configs/motionpro.h -@@ -108,7 +108,7 @@ - "rootpath=/opt/eldk-4.2/ppc_6xx\0" \ - "u-boot=/tftpboot/motionpro/u-boot.bin\0" \ - "bootfile=/tftpboot/motionpro/uImage\0" \ -- "fdt_file=/tftpboot/motionpro/motionpro.dtb\0" \ -+ "fdtfile=/tftpboot/motionpro/motionpro.dtb\0" \ - "ramdisk_file=/tftpboot/motionpro/uRamdisk\0" \ - "multi_image_file=kernel+initrd+dtb.img\0" \ - "load=tftp ${u-boot_addr} ${u-boot}\0" \ -@@ -131,11 +131,11 @@ - "${netmask}:${hostname}:${netdev}:off panic=1 " \ - "console=${console}\0" \ - "net_nfs=tftp ${kernel_addr} ${bootfile}; " \ -- "tftp ${fdt_addr} ${fdt_file}; " \ -+ "tftp ${fdt_addr} ${fdtfile}; " \ - "run nfsargs addip addmtd; " \ - "bootm ${kernel_addr} - ${fdt_addr}\0" \ - "net_self=tftp ${kernel_addr} ${bootfile}; " \ -- "tftp ${fdt_addr} ${fdt_file}; " \ -+ "tftp ${fdt_addr} ${fdtfile}; " \ - "tftp ${ramdisk_addr} ${ramdisk_file}; " \ - "nfs ${ramdisk_addr} ${serverip}:${rootpath}/images/uRamdisk; " \ - "run ramargs addip addcons addmtd; " \ -diff --git a/include/configs/muas3001.h b/include/configs/muas3001.h -index 7343c94..2142140 100644 ---- a/include/configs/muas3001.h -+++ b/include/configs/muas3001.h -@@ -134,7 +134,7 @@ - "rootpath=/opt/eldk/ppc_6xx\0" \ - "u-boot=muas3001/u-boot.bin\0" \ - "bootfile=muas3001/uImage\0" \ -- "fdt_file=muas3001/muas3001.dtb\0" \ -+ "fdtfile=muas3001/muas3001.dtb\0" \ - "ramdisk_file=uRamdisk\0" \ - "load=tftp ${u-boot_addr_r} ${u-boot}\0" \ - "update=prot off ff000000 ff03ffff; era ff000000 ff03ffff; " \ -@@ -149,10 +149,10 @@ - "ip=${ipaddr}:${serverip}:${gatewayip}:" \ - "${netmask}:${hostname}:${netdev}:off panic=1\0" \ - "net_nfs=tftp ${kernel_addr_r} ${bootfile}; " \ -- "tftp ${fdt_addr_r} ${fdt_file}; run nfsargs addip addcons;" \ -+ "tftp ${fdt_addr_r} ${fdtfile}; run nfsargs addip addcons;" \ - "bootm ${kernel_addr_r} - ${fdt_addr_r}\0" \ - "net_self=tftp ${kernel_addr_r} ${bootfile}; " \ -- "tftp ${fdt_addr_r} ${fdt_file}; " \ -+ "tftp ${fdt_addr_r} ${fdtfile}; " \ - "tftp ${ramdisk_addr} ${ramdisk_file}; " \ - "run ramargs addip; " \ - "bootm ${kernel_addr_r} ${ramdisk_addr} ${fdt_addr_r}\0" \ -@@ -167,7 +167,7 @@ - "updatekernel=era ${kernel_addr} +1b0000;tftpb ${kernel_addr_r}" \ - " ${bootfile};" \ - "cp.b ${kernel_addr_r} ${kernel_addr} ${filesize}\0" \ -- "updatefdt=era ${fdt_addr} +10000;tftpb ${fdt_addr_r} ${fdt_file};" \ -+ "updatefdt=era ${fdt_addr} +10000;tftpb ${fdt_addr_r} ${fdtfile};" \ - "cp.b ${fdt_addr_r} ${fdt_addr} ${filesize}\0" \ - "" - -diff --git a/include/configs/mx23_olinuxino.h b/include/configs/mx23_olinuxino.h -index e377fea..881d5d4 100644 ---- a/include/configs/mx23_olinuxino.h -+++ b/include/configs/mx23_olinuxino.h -@@ -85,7 +85,7 @@ - "script=boot.scr\0" \ - "uimage=uImage\0" \ - "console=ttyAMA0\0" \ -- "fdt_file=imx23-olinuxino.dtb\0" \ -+ "fdtfile=imx23-olinuxino.dtb\0" \ - "fdt_addr=0x41000000\0" \ - "boot_fdt=try\0" \ - "ip_dyn=yes\0" \ -@@ -99,7 +99,7 @@ - "bootscript=echo Running bootscript from mmc ...; " \ - "source\0" \ - "loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \ -- "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \ -+ "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdtfile}\0" \ - "mmcboot=echo Booting from mmc ...; " \ - "run mmcargs; " \ - "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ -@@ -128,7 +128,7 @@ - "fi; " \ - "${get_cmd} ${uimage}; " \ - "if test ${boot_fdt} = yes; then " \ -- "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \ -+ "if ${get_cmd} ${fdt_addr} ${fdtfile}; then " \ - "bootm ${loadaddr} - ${fdt_addr}; " \ - "else " \ - "if test ${boot_fdt} = try; then " \ -diff --git a/include/configs/mx23evk.h b/include/configs/mx23evk.h -index b496892..b7cba30 100644 ---- a/include/configs/mx23evk.h -+++ b/include/configs/mx23evk.h -@@ -86,7 +86,7 @@ - "script=boot.scr\0" \ - "image=zImage\0" \ - "console=ttyAMA0\0" \ -- "fdt_file=imx23-evk.dtb\0" \ -+ "fdtfile=imx23-evk.dtb\0" \ - "fdt_addr=0x41000000\0" \ - "boot_fdt=try\0" \ - "mmcdev=0\0" \ -@@ -99,7 +99,7 @@ - "bootscript=echo Running bootscript from mmc ...; " \ - "source\0" \ - "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \ -- "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \ -+ "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdtfile}\0" \ - "mmcboot=echo Booting from mmc ...; " \ - "run mmcargs; " \ - "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ -diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h -index 9b9124a..071e510 100644 ---- a/include/configs/mx28evk.h -+++ b/include/configs/mx28evk.h -@@ -208,7 +208,7 @@ - "else " \ - "setenv get_cmd tftp; " \ - "fi; " \ -- "${get_cmd} ${fdt_file}; " \ -+ "${get_cmd} ${fdtfile}; " \ - "nand write ${loadaddr} fdt ${filesize}\0" \ - "update_nand_filesystem=" /* Update filesystem */ \ - "mtdparts default; " \ -@@ -251,7 +251,7 @@ - "image=zImage\0" \ - "console_fsl=ttyAM0\0" \ - "console_mainline=ttyAMA0\0" \ -- "fdt_file=imx28-evk.dtb\0" \ -+ "fdtfile=imx28-evk.dtb\0" \ - "fdt_addr=0x41000000\0" \ - "boot_fdt=try\0" \ - "ip_dyn=yes\0" \ -@@ -265,7 +265,7 @@ - "bootscript=echo Running bootscript from mmc ...; " \ - "source\0" \ - "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \ -- "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \ -+ "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdtfile}\0" \ - "mmcboot=echo Booting from mmc ...; " \ - "run mmcargs; " \ - "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ -@@ -293,7 +293,7 @@ - "fi; " \ - "${get_cmd} ${image}; " \ - "if test ${boot_fdt} = yes; then " \ -- "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \ -+ "if ${get_cmd} ${fdt_addr} ${fdtfile}; then " \ - "bootz ${loadaddr} - ${fdt_addr}; " \ - "else " \ - "if test ${boot_fdt} = try; then " \ -diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h -index b389475..f573434 100644 ---- a/include/configs/mx51evk.h -+++ b/include/configs/mx51evk.h -@@ -144,7 +144,7 @@ - #define CONFIG_EXTRA_ENV_SETTINGS \ - "script=boot.scr\0" \ - "image=zImage\0" \ -- "fdt_file=imx51-babbage.dtb\0" \ -+ "fdtfile=imx51-babbage.dtb\0" \ - "fdt_addr=0x91000000\0" \ - "boot_fdt=try\0" \ - "ip_dyn=yes\0" \ -@@ -158,7 +158,7 @@ - "bootscript=echo Running bootscript from mmc ...; " \ - "source\0" \ - "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \ -- "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \ -+ "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdtfile}\0" \ - "mmcboot=echo Booting from mmc ...; " \ - "run mmcargs; " \ - "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ -@@ -186,7 +186,7 @@ - "fi; " \ - "${get_cmd} ${image}; " \ - "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ -- "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \ -+ "if ${get_cmd} ${fdt_addr} ${fdtfile}; then " \ - "bootz ${loadaddr} - ${fdt_addr}; " \ - "else " \ - "if test ${boot_fdt} = try; then " \ -diff --git a/include/configs/mx53ard.h b/include/configs/mx53ard.h -index 797a637..d4e4161 100644 ---- a/include/configs/mx53ard.h -+++ b/include/configs/mx53ard.h -@@ -98,7 +98,7 @@ - "console=ttymxc0\0" \ - "fdt_high=0xffffffff\0" \ - "initrd_high=0xffffffff\0" \ -- "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \ -+ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ - "fdt_addr=0x71000000\0" \ - "boot_fdt=try\0" \ - "ip_dyn=yes\0" \ -@@ -126,7 +126,7 @@ - "bootscript=echo Running bootscript from mmc ...; " \ - "source\0" \ - "loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \ -- "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \ -+ "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdtfile}\0" \ - "mmcboot=echo Booting from mmc ...; " \ - "run mmcargs; " \ - "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ -@@ -154,7 +154,7 @@ - "fi; " \ - "${get_cmd} ${uimage}; " \ - "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ -- "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \ -+ "if ${get_cmd} ${fdt_addr} ${fdtfile}; then " \ - "bootm ${loadaddr} - ${fdt_addr}; " \ - "else " \ - "if test ${boot_fdt} = try; then " \ -diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h -index 1415584..cfc8f1e 100644 ---- a/include/configs/mx53loco.h -+++ b/include/configs/mx53loco.h -@@ -105,7 +105,7 @@ - #define CONFIG_EXTRA_ENV_SETTINGS \ - "script=boot.scr\0" \ - "image=zImage\0" \ -- "fdt_file=imx53-qsb.dtb\0" \ -+ "fdtfile=imx53-qsb.dtb\0" \ - "fdt_addr=0x71000000\0" \ - "boot_fdt=try\0" \ - "ip_dyn=yes\0" \ -@@ -118,7 +118,7 @@ - "bootscript=echo Running bootscript from mmc ...; " \ - "source\0" \ - "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \ -- "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \ -+ "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdtfile}\0" \ - "mmcboot=echo Booting from mmc ...; " \ - "run mmcargs; " \ - "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ -@@ -146,7 +146,7 @@ - "fi; " \ - "${get_cmd} ${image}; " \ - "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ -- "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \ -+ "if ${get_cmd} ${fdt_addr} ${fdtfile}; then " \ - "bootz ${loadaddr} - ${fdt_addr}; " \ - "else " \ - "if test ${boot_fdt} = try; then " \ -diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h -index 7a2c172..df5060c 100644 ---- a/include/configs/mx6sabre_common.h -+++ b/include/configs/mx6sabre_common.h -@@ -120,7 +120,7 @@ - #define CONFIG_EXTRA_ENV_SETTINGS \ - "script=boot.scr\0" \ - "image=zImage\0" \ -- "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \ -+ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ - "fdt_addr=0x18000000\0" \ - "boot_fdt=try\0" \ - "ip_dyn=yes\0" \ -@@ -151,7 +151,7 @@ - "bootscript=echo Running bootscript from mmc ...; " \ - "source\0" \ - "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \ -- "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \ -+ "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdtfile}\0" \ - "mmcboot=echo Booting from mmc ...; " \ - "run mmcargs; " \ - "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ -@@ -179,7 +179,7 @@ - "fi; " \ - "${get_cmd} ${image}; " \ - "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ -- "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \ -+ "if ${get_cmd} ${fdt_addr} ${fdtfile}; then " \ - "bootz ${loadaddr} - ${fdt_addr}; " \ - "else " \ - "if test ${boot_fdt} = try; then " \ -diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h -index 1876dbf..74e411e 100644 ---- a/include/configs/mx6slevk.h -+++ b/include/configs/mx6slevk.h -@@ -80,7 +80,7 @@ - "console=ttymxc0\0" \ - "fdt_high=0xffffffff\0" \ - "initrd_high=0xffffffff\0" \ -- "fdt_file=imx6sl-evk.dtb\0" \ -+ "fdtfile=imx6sl-evk.dtb\0" \ - "fdt_addr=0x88000000\0" \ - "boot_fdt=try\0" \ - "ip_dyn=yes\0" \ -@@ -94,7 +94,7 @@ - "bootscript=echo Running bootscript from mmc ...; " \ - "source\0" \ - "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \ -- "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \ -+ "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdtfile}\0" \ - "mmcboot=echo Booting from mmc ...; " \ - "run mmcargs; " \ - "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ -@@ -122,7 +122,7 @@ - "fi; " \ - "${get_cmd} ${image}; " \ - "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ -- "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \ -+ "if ${get_cmd} ${fdt_addr} ${fdtfile}; then " \ - "bootz ${loadaddr} - ${fdt_addr}; " \ - "else " \ - "if test ${boot_fdt} = try; then " \ -diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h -index f2db8c5..a8a477e 100644 ---- a/include/configs/nitrogen6x.h -+++ b/include/configs/nitrogen6x.h -@@ -180,7 +180,7 @@ - "console=ttymxc1\0" \ - "fdt_high=0xffffffff\0" \ - "initrd_high=0xffffffff\0" \ -- "fdt_file=imx6q-sabrelite.dtb\0" \ -+ "fdtfile=imx6q-sabrelite.dtb\0" \ - "fdt_addr=0x18000000\0" \ - "boot_fdt=try\0" \ - "ip_dyn=yes\0" \ -@@ -194,7 +194,7 @@ - "bootscript=echo Running bootscript from mmc ...; " \ - "source\0" \ - "loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \ -- "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \ -+ "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdtfile}\0" \ - "mmcboot=echo Booting from mmc ...; " \ - "run mmcargs; " \ - "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ -@@ -222,7 +222,7 @@ - "fi; " \ - "${get_cmd} ${uimage}; " \ - "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ -- "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \ -+ "if ${get_cmd} ${fdt_addr} ${fdtfile}; then " \ - "bootm ${loadaddr} - ${fdt_addr}; " \ - "else " \ - "if test ${boot_fdt} = try; then " \ -diff --git a/include/configs/o2dnt-common.h b/include/configs/o2dnt-common.h -index 133dc6f..83f9d50 100644 ---- a/include/configs/o2dnt-common.h -+++ b/include/configs/o2dnt-common.h -@@ -135,13 +135,13 @@ - - #define CONFIG_IFM_DEFAULT_ENV_NEW \ - "fdt_addr_r=900000\0" \ -- "fdt_file="CONFIG_BOARD_NAME"/"CONFIG_BOARD_NAME".dtb\0" \ -+ "fdtfile="CONFIG_BOARD_NAME"/"CONFIG_BOARD_NAME".dtb\0" \ - "flash_self=run ramargs addip addtty addmisc;" \ - "bootm ${kernel_addr} ${ramdisk_addr} ${fdt_addr}\0" \ - "flash_nfs=run nfsargs addip addtty addmisc;" \ - "bootm ${kernel_addr} - ${fdt_addr}\0" \ - "net_nfs=tftp ${kernel_addr_r} ${bootfile}; " \ -- "tftp ${fdt_addr_r} ${fdt_file}; " \ -+ "tftp ${fdt_addr_r} ${fdtfile}; " \ - "run nfsargs addip addtty addmisc;" \ - "bootm ${kernel_addr_r} - ${fdt_addr_r}\0" \ - -diff --git a/include/configs/socrates.h b/include/configs/socrates.h -index c654a0e..27bc358 100644 ---- a/include/configs/socrates.h -+++ b/include/configs/socrates.h -@@ -380,7 +380,7 @@ - "consdev=ttyS0\0" \ - "uboot_file=/home/tftp/syscon3/u-boot.bin\0" \ - "bootfile=/home/tftp/syscon3/uImage\0" \ -- "fdt_file=/home/tftp/syscon3/socrates.dtb\0" \ -+ "fdtfile=/home/tftp/syscon3/socrates.dtb\0" \ - "initrd_file=/home/tftp/syscon3/uinitrd.gz\0" \ - "uboot_addr=FFFA0000\0" \ - "kernel_addr=FE000000\0" \ -@@ -401,7 +401,7 @@ - "boot_nor=run ramargs addcons;" \ - "bootm ${kernel_addr} ${ramdisk_addr} ${fdt_addr}\0" \ - "net_nfs=tftp ${kernel_addr_r} ${bootfile}; " \ -- "tftp ${fdt_addr_r} ${fdt_file}; " \ -+ "tftp ${fdt_addr_r} ${fdtfile}; " \ - "run nfsargs addip addcons;" \ - "bootm ${kernel_addr_r} - ${fdt_addr_r}\0" \ - "update_uboot=tftp 100000 ${uboot_file};" \ -@@ -413,7 +413,7 @@ - "era fe000000 fe1dffff;" \ - "cp.b 100000 fe000000 ${filesize};" \ - "setenv filesize;saveenv\0" \ -- "update_fdt=tftp 100000 ${fdt_file};" \ -+ "update_fdt=tftp 100000 ${fdtfile};" \ - "era fe1e0000 fe1fffff;" \ - "cp.b 100000 fe1e0000 ${filesize};" \ - "setenv filesize;saveenv\0" \ -diff --git a/include/configs/udoo.h b/include/configs/udoo.h -index a0306de..88e503b 100644 ---- a/include/configs/udoo.h -+++ b/include/configs/udoo.h -@@ -105,7 +105,7 @@ - "splashpos=m,m\0" \ - "fdt_high=0xffffffff\0" \ - "initrd_high=0xffffffff\0" \ -- "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \ -+ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ - "fdt_addr=0x18000000\0" \ - "boot_fdt=try\0" \ - "ip_dyn=yes\0" \ -@@ -133,7 +133,7 @@ - "bootscript=echo Running bootscript from mmc ...; " \ - "source\0" \ - "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \ -- "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \ -+ "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdtfile}\0" \ - "mmcboot=echo Booting from mmc ...; " \ - "run mmcargs; " \ - "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ -@@ -161,7 +161,7 @@ - "fi; " \ - "${get_cmd} ${image}; " \ - "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ -- "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \ -+ "if ${get_cmd} ${fdt_addr} ${fdtfile}; then " \ - "bootz ${loadaddr} - ${fdt_addr}; " \ - "else " \ - "if test ${boot_fdt} = try; then " \ -diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h -index 500fd2f..208c2cc 100644 ---- a/include/configs/vf610twr.h -+++ b/include/configs/vf610twr.h -@@ -85,7 +85,7 @@ - "console=ttyLP1\0" \ - "fdt_high=0xffffffff\0" \ - "initrd_high=0xffffffff\0" \ -- "fdt_file=vf610-twr.dtb\0" \ -+ "fdtfile=vf610-twr.dtb\0" \ - "fdt_addr=0x81000000\0" \ - "boot_fdt=try\0" \ - "ip_dyn=yes\0" \ -@@ -113,7 +113,7 @@ - "bootscript=echo Running bootscript from mmc ...; " \ - "source\0" \ - "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \ -- "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \ -+ "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdtfile}\0" \ - "mmcboot=echo Booting from mmc ...; " \ - "run mmcargs; " \ - "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ -@@ -141,7 +141,7 @@ - "fi; " \ - "${get_cmd} ${image}; " \ - "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ -- "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \ -+ "if ${get_cmd} ${fdt_addr} ${fdtfile}; then " \ - "bootz ${loadaddr} - ${fdt_addr}; " \ - "else " \ - "if test ${boot_fdt} = try; then " \ --- -1.9.0 - diff --git a/0012-check-for-fdtfile-and-fdt_file-to-find-the-devicetre.patch b/0012-check-for-fdtfile-and-fdt_file-to-find-the-devicetre.patch deleted file mode 100644 index bbe566e..0000000 --- a/0012-check-for-fdtfile-and-fdt_file-to-find-the-devicetre.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 3f7058a106fde4bf69b76933a1e2f56a051d8466 Mon Sep 17 00:00:00 2001 -From: Dennis Gilmore -Date: Tue, 18 Mar 2014 16:13:38 -0500 -Subject: [PATCH 12/13] check for fdtfile and fdt_file to find the devicetree - file - ---- - common/cmd_pxe.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/common/cmd_pxe.c b/common/cmd_pxe.c -index 3483328..c58e471 100644 ---- a/common/cmd_pxe.c -+++ b/common/cmd_pxe.c -@@ -712,6 +712,13 @@ static int label_boot(cmd_tbl_t *cmdtp, struct pxe_label *label) - char *f1, *f2, *f3, *f4, *slash; - - f1 = getenv("fdtfile"); -+ /* -+ * some boards have used fdt_file as the environment variable for -+ * defining the device tree file so lets check for fdt_file also. -+ */ -+ if (!f1) { -+ f1 = getenv("fdt_file"); -+ } - if (f1) { - f2 = ""; - f3 = ""; --- -1.9.0 - diff --git a/0012-cleanup-duplicate-options-in-paz00-config.patch b/0012-cleanup-duplicate-options-in-paz00-config.patch new file mode 100644 index 0000000..957ac15 --- /dev/null +++ b/0012-cleanup-duplicate-options-in-paz00-config.patch @@ -0,0 +1,25 @@ +From fcadba88c2e9d7214b25a8ed4d263ebbc22f0680 Mon Sep 17 00:00:00 2001 +From: Dennis Gilmore +Date: Mon, 21 Apr 2014 12:31:22 -0500 +Subject: [PATCH 12/14] cleanup duplicate options in paz00 config + +--- + include/configs/paz00.h | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/include/configs/paz00.h b/include/configs/paz00.h +index dd0abf8..8fc2b5a 100644 +--- a/include/configs/paz00.h ++++ b/include/configs/paz00.h +@@ -61,8 +61,6 @@ + #define CONFIG_USB_ETHER_ASIX + + /* General networking support */ +-#define CONFIG_CMD_NET +-#define CONFIG_CMD_DHCP + + /* LCD support */ + #define CONFIG_LCD +-- +1.9.0 + diff --git a/0013-add-hackish-utilite-build-based-on-wandboard.patch b/0013-add-hackish-utilite-build-based-on-wandboard.patch new file mode 100644 index 0000000..79ed7ad --- /dev/null +++ b/0013-add-hackish-utilite-build-based-on-wandboard.patch @@ -0,0 +1,601 @@ +From f57beade9b49254f82f2e817e727161c08f0c38a Mon Sep 17 00:00:00 2001 +From: Dennis Gilmore +Date: Mon, 21 Apr 2014 12:33:43 -0500 +Subject: [PATCH 13/14] add hackish utilite build based on wandboard + +--- + board/compulab/utilite/Makefile | 7 + + board/compulab/utilite/README | 45 ++++++ + board/compulab/utilite/utilite.c | 316 +++++++++++++++++++++++++++++++++++++++ + boards.cfg | 1 + + include/configs/utilite.h | 177 ++++++++++++++++++++++ + 5 files changed, 546 insertions(+) + create mode 100644 board/compulab/utilite/Makefile + create mode 100644 board/compulab/utilite/README + create mode 100644 board/compulab/utilite/utilite.c + create mode 100644 include/configs/utilite.h + +diff --git a/board/compulab/utilite/Makefile b/board/compulab/utilite/Makefile +new file mode 100644 +index 0000000..f0d8f12 +--- /dev/null ++++ b/board/compulab/utilite/Makefile +@@ -0,0 +1,7 @@ ++# ++# (C) Copyright 2013 Freescale Semiconductor, Inc. ++# ++# SPDX-License-Identifier: GPL-2.0+ ++# ++ ++obj-y := utilite.o +diff --git a/board/compulab/utilite/README b/board/compulab/utilite/README +new file mode 100644 +index 0000000..8ebb650 +--- /dev/null ++++ b/board/compulab/utilite/README +@@ -0,0 +1,45 @@ ++U-Boot for Utilite ++-------------------- ++ ++This file contains information for the port of U-Boot to the Utilite. ++ ++Utilite is a development board that has three variants based on the following ++SoCs: mx6 quad, mx6 dual lite and mx6 solo. ++ ++For more details about Utilite, please refer to: ++http://www.utilite.org/ ++ ++Building U-boot for Utilite ++----------------------------- ++ ++To build U-Boot for the Utilite Dual Lite version: ++ ++$ make utilite_dl_config ++$ make ++ ++To build U-Boot for the Utilite Solo version: ++ ++$ make utilite_solo_config ++$ make ++ ++To build U-Boot for the Utilite Quad version: ++ ++$ make utilite_quad_config ++$ make ++ ++Flashing U-boot into the SD card ++-------------------------------- ++ ++- After the 'make' command completes, the generated 'u-boot.imx' binary must be ++flashed into the SD card; ++ ++$ sudo dd if=u-boot.imx of=/dev/mmcblk0 bs=512 seek=2; sync ++ ++(Note - the SD card node may vary, so adjust this as needed). ++ ++- Insert the SD card into the slot located in the bottom of the board (same side ++as the mx6 processor) ++ ++- Connect the serial cable to the host PC ++ ++- Power up the board and U-boot messages will appear in the serial console. +diff --git a/board/compulab/utilite/utilite.c b/board/compulab/utilite/utilite.c +new file mode 100644 +index 0000000..55490ee +--- /dev/null ++++ b/board/compulab/utilite/utilite.c +@@ -0,0 +1,316 @@ ++/* ++ * Copyright (C) 2013 Freescale Semiconductor, Inc. ++ * ++ * Author: Fabio Estevam ++ * ++ * SPDX-License-Identifier: GPL-2.0+ ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++DECLARE_GLOBAL_DATA_PTR; ++ ++#define UART_PAD_CTRL (PAD_CTL_PUS_100K_UP | \ ++ PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | \ ++ PAD_CTL_SRE_FAST | PAD_CTL_HYS) ++ ++#define USDHC_PAD_CTRL (PAD_CTL_PUS_47K_UP | \ ++ PAD_CTL_SPEED_LOW | PAD_CTL_DSE_80ohm | \ ++ PAD_CTL_SRE_FAST | PAD_CTL_HYS) ++ ++#define ENET_PAD_CTRL (PAD_CTL_PUS_100K_UP | \ ++ PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_HYS) ++ ++#define USDHC1_CD_GPIO IMX_GPIO_NR(1, 2) ++#define USDHC3_CD_GPIO IMX_GPIO_NR(3, 9) ++#define ETH_PHY_RESET IMX_GPIO_NR(3, 29) ++ ++int dram_init(void) ++{ ++ gd->ram_size = (phys_size_t)CONFIG_DDR_MB * 1024 * 1024; ++ ++ return 0; ++} ++ ++static iomux_v3_cfg_t const uart1_pads[] = { ++ MX6_PAD_CSI0_DAT10__UART1_TX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL), ++ MX6_PAD_CSI0_DAT11__UART1_RX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL), ++}; ++ ++static iomux_v3_cfg_t const usdhc1_pads[] = { ++ MX6_PAD_SD1_CLK__SD1_CLK | MUX_PAD_CTRL(USDHC_PAD_CTRL), ++ MX6_PAD_SD1_CMD__SD1_CMD | MUX_PAD_CTRL(USDHC_PAD_CTRL), ++ MX6_PAD_SD1_DAT0__SD1_DATA0 | MUX_PAD_CTRL(USDHC_PAD_CTRL), ++ MX6_PAD_SD1_DAT1__SD1_DATA1 | MUX_PAD_CTRL(USDHC_PAD_CTRL), ++ MX6_PAD_SD1_DAT2__SD1_DATA2 | MUX_PAD_CTRL(USDHC_PAD_CTRL), ++ MX6_PAD_SD1_DAT3__SD1_DATA3 | MUX_PAD_CTRL(USDHC_PAD_CTRL), ++ /* Carrier MicroSD Card Detect */ ++ MX6_PAD_GPIO_2__GPIO1_IO02 | MUX_PAD_CTRL(NO_PAD_CTRL), ++}; ++ ++static iomux_v3_cfg_t const usdhc3_pads[] = { ++ MX6_PAD_SD3_CLK__SD3_CLK | MUX_PAD_CTRL(USDHC_PAD_CTRL), ++ MX6_PAD_SD3_CMD__SD3_CMD | MUX_PAD_CTRL(USDHC_PAD_CTRL), ++ MX6_PAD_SD3_DAT0__SD3_DATA0 | MUX_PAD_CTRL(USDHC_PAD_CTRL), ++ MX6_PAD_SD3_DAT1__SD3_DATA1 | MUX_PAD_CTRL(USDHC_PAD_CTRL), ++ MX6_PAD_SD3_DAT2__SD3_DATA2 | MUX_PAD_CTRL(USDHC_PAD_CTRL), ++ MX6_PAD_SD3_DAT3__SD3_DATA3 | MUX_PAD_CTRL(USDHC_PAD_CTRL), ++ /* SOM MicroSD Card Detect */ ++ MX6_PAD_EIM_DA9__GPIO3_IO09 | MUX_PAD_CTRL(NO_PAD_CTRL), ++}; ++ ++static iomux_v3_cfg_t const enet_pads[] = { ++ MX6_PAD_ENET_MDIO__ENET_MDIO | MUX_PAD_CTRL(ENET_PAD_CTRL), ++ MX6_PAD_ENET_MDC__ENET_MDC | MUX_PAD_CTRL(ENET_PAD_CTRL), ++ MX6_PAD_RGMII_TXC__RGMII_TXC | MUX_PAD_CTRL(ENET_PAD_CTRL), ++ MX6_PAD_RGMII_TD0__RGMII_TD0 | MUX_PAD_CTRL(ENET_PAD_CTRL), ++ MX6_PAD_RGMII_TD1__RGMII_TD1 | MUX_PAD_CTRL(ENET_PAD_CTRL), ++ MX6_PAD_RGMII_TD2__RGMII_TD2 | MUX_PAD_CTRL(ENET_PAD_CTRL), ++ MX6_PAD_RGMII_TD3__RGMII_TD3 | MUX_PAD_CTRL(ENET_PAD_CTRL), ++ MX6_PAD_RGMII_TX_CTL__RGMII_TX_CTL | MUX_PAD_CTRL(ENET_PAD_CTRL), ++ MX6_PAD_ENET_REF_CLK__ENET_TX_CLK | MUX_PAD_CTRL(ENET_PAD_CTRL), ++ MX6_PAD_RGMII_RXC__RGMII_RXC | MUX_PAD_CTRL(ENET_PAD_CTRL), ++ MX6_PAD_RGMII_RD0__RGMII_RD0 | MUX_PAD_CTRL(ENET_PAD_CTRL), ++ MX6_PAD_RGMII_RD1__RGMII_RD1 | MUX_PAD_CTRL(ENET_PAD_CTRL), ++ MX6_PAD_RGMII_RD2__RGMII_RD2 | MUX_PAD_CTRL(ENET_PAD_CTRL), ++ MX6_PAD_RGMII_RD3__RGMII_RD3 | MUX_PAD_CTRL(ENET_PAD_CTRL), ++ MX6_PAD_RGMII_RX_CTL__RGMII_RX_CTL | MUX_PAD_CTRL(ENET_PAD_CTRL), ++ /* AR8031 PHY Reset */ ++ MX6_PAD_EIM_D29__GPIO3_IO29 | MUX_PAD_CTRL(NO_PAD_CTRL), ++}; ++ ++static void setup_iomux_uart(void) ++{ ++ imx_iomux_v3_setup_multiple_pads(uart1_pads, ARRAY_SIZE(uart1_pads)); ++} ++ ++static void setup_iomux_enet(void) ++{ ++ imx_iomux_v3_setup_multiple_pads(enet_pads, ARRAY_SIZE(enet_pads)); ++ ++ /* Reset AR8031 PHY */ ++ gpio_direction_output(ETH_PHY_RESET, 0); ++ udelay(500); ++ gpio_set_value(ETH_PHY_RESET, 1); ++} ++ ++static struct fsl_esdhc_cfg usdhc_cfg[2] = { ++ {USDHC3_BASE_ADDR}, ++ {USDHC1_BASE_ADDR}, ++}; ++ ++int board_mmc_getcd(struct mmc *mmc) ++{ ++ struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv; ++ int ret = 0; ++ ++ switch (cfg->esdhc_base) { ++ case USDHC1_BASE_ADDR: ++ ret = !gpio_get_value(USDHC1_CD_GPIO); ++ break; ++ case USDHC3_BASE_ADDR: ++ ret = !gpio_get_value(USDHC3_CD_GPIO); ++ break; ++ } ++ ++ return ret; ++} ++ ++int board_mmc_init(bd_t *bis) ++{ ++ s32 status = 0; ++ u32 index = 0; ++ ++ /* ++ * Following map is done: ++ * (U-boot device node) (Physical Port) ++ * mmc0 SOM MicroSD ++ * mmc1 Carrier board MicroSD ++ */ ++ for (index = 0; index < CONFIG_SYS_FSL_USDHC_NUM; ++index) { ++ switch (index) { ++ case 0: ++ imx_iomux_v3_setup_multiple_pads( ++ usdhc3_pads, ARRAY_SIZE(usdhc3_pads)); ++ usdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC3_CLK); ++ usdhc_cfg[0].max_bus_width = 4; ++ gpio_direction_input(USDHC3_CD_GPIO); ++ break; ++ case 1: ++ imx_iomux_v3_setup_multiple_pads( ++ usdhc1_pads, ARRAY_SIZE(usdhc1_pads)); ++ usdhc_cfg[1].sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK); ++ usdhc_cfg[1].max_bus_width = 4; ++ gpio_direction_input(USDHC1_CD_GPIO); ++ break; ++ default: ++ printf("Warning: you configured more USDHC controllers" ++ "(%d) then supported by the board (%d)\n", ++ index + 1, CONFIG_SYS_FSL_USDHC_NUM); ++ return status; ++ } ++ ++ status |= fsl_esdhc_initialize(bis, &usdhc_cfg[index]); ++ } ++ ++ return status; ++} ++ ++static int mx6_rgmii_rework(struct phy_device *phydev) ++{ ++ unsigned short val; ++ ++ /* To enable AR8031 ouput a 125MHz clk from CLK_25M */ ++ phy_write(phydev, MDIO_DEVAD_NONE, 0xd, 0x7); ++ phy_write(phydev, MDIO_DEVAD_NONE, 0xe, 0x8016); ++ phy_write(phydev, MDIO_DEVAD_NONE, 0xd, 0x4007); ++ ++ val = phy_read(phydev, MDIO_DEVAD_NONE, 0xe); ++ val &= 0xffe3; ++ val |= 0x18; ++ phy_write(phydev, MDIO_DEVAD_NONE, 0xe, val); ++ ++ /* introduce tx clock delay */ ++ phy_write(phydev, MDIO_DEVAD_NONE, 0x1d, 0x5); ++ val = phy_read(phydev, MDIO_DEVAD_NONE, 0x1e); ++ val |= 0x0100; ++ phy_write(phydev, MDIO_DEVAD_NONE, 0x1e, val); ++ ++ return 0; ++} ++ ++int board_phy_config(struct phy_device *phydev) ++{ ++ mx6_rgmii_rework(phydev); ++ ++ if (phydev->drv->config) ++ phydev->drv->config(phydev); ++ ++ return 0; ++} ++ ++#if defined(CONFIG_VIDEO_IPUV3) ++static struct fb_videomode const hdmi = { ++ .name = "HDMI", ++ .refresh = 60, ++ .xres = 1024, ++ .yres = 768, ++ .pixclock = 15385, ++ .left_margin = 220, ++ .right_margin = 40, ++ .upper_margin = 21, ++ .lower_margin = 7, ++ .hsync_len = 60, ++ .vsync_len = 10, ++ .sync = FB_SYNC_EXT, ++ .vmode = FB_VMODE_NONINTERLACED ++}; ++ ++int board_video_skip(void) ++{ ++ int ret; ++ ++ ret = ipuv3_fb_init(&hdmi, 0, IPU_PIX_FMT_RGB24); ++ ++ if (ret) { ++ printf("HDMI cannot be configured: %d\n", ret); ++ return ret; ++ } ++ ++ imx_enable_hdmi_phy(); ++ ++ return ret; ++} ++ ++static void setup_display(void) ++{ ++ struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR; ++ int reg; ++ ++ enable_ipu_clock(); ++ imx_setup_hdmi(); ++ ++ reg = readl(&mxc_ccm->chsccdr); ++ reg |= (CHSCCDR_CLK_SEL_LDB_DI0 ++ << MXC_CCM_CHSCCDR_IPU1_DI0_CLK_SEL_OFFSET); ++ writel(reg, &mxc_ccm->chsccdr); ++} ++#endif /* CONFIG_VIDEO_IPUV3 */ ++ ++int board_eth_init(bd_t *bis) ++{ ++ setup_iomux_enet(); ++ ++ return cpu_eth_init(bis); ++} ++ ++int board_early_init_f(void) ++{ ++ setup_iomux_uart(); ++#if defined(CONFIG_VIDEO_IPUV3) ++ setup_display(); ++#endif ++ return 0; ++} ++ ++/* ++ * Do not overwrite the console ++ * Use always serial for U-Boot console ++ */ ++int overwrite_console(void) ++{ ++ return 1; ++} ++ ++#ifdef CONFIG_CMD_BMODE ++static const struct boot_mode board_boot_modes[] = { ++ /* 4 bit bus width */ ++ {"mmc0", MAKE_CFGVAL(0x40, 0x30, 0x00, 0x00)}, ++ {"mmc1", MAKE_CFGVAL(0x40, 0x20, 0x00, 0x00)}, ++ {NULL, 0}, ++}; ++#endif ++ ++int board_late_init(void) ++{ ++#ifdef CONFIG_CMD_BMODE ++ add_board_boot_modes(board_boot_modes); ++#endif ++ ++ return 0; ++} ++ ++int board_init(void) ++{ ++ /* address of boot parameters */ ++ gd->bd->bi_boot_params = PHYS_SDRAM + 0x100; ++ ++ return 0; ++} ++ ++int checkboard(void) ++{ ++ puts("Board: Utilite\n"); ++ ++ return 0; ++} +diff --git a/boards.cfg b/boards.cfg +index b4203f1..49ea4ab 100644 +--- a/boards.cfg ++++ b/boards.cfg +@@ -316,6 +316,7 @@ Active arm armv7 mx6 boundary nitrogen6x + Active arm armv7 mx6 boundary nitrogen6x nitrogen6q2g nitrogen6x:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q2g.cfg,MX6Q,DDR_MB=2048 Eric Nelson + Active arm armv7 mx6 boundary nitrogen6x nitrogen6s nitrogen6x:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s.cfg,MX6S,DDR_MB=512 Eric Nelson + Active arm armv7 mx6 boundary nitrogen6x nitrogen6s1g nitrogen6x:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s1g.cfg,MX6S,DDR_MB=1024 Eric Nelson ++Active arm armv7 mx6 compulab utilite utilite_quad utilite:IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q2g.cfg,MX6Q,DDR_MB=2048 Fabio Estevam + Active arm armv7 mx6 congatec cgtqmx6eval cgtqmx6qeval cgtqmx6eval:IMX_CONFIG=board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg,MX6Q Leo Sartre + Active arm armv7 mx6 freescale mx6qarm2 mx6qarm2 mx6qarm2:IMX_CONFIG=board/freescale/mx6qarm2/imximage.cfg Jason Liu + Active arm armv7 mx6 freescale mx6qsabreauto mx6qsabreauto mx6qsabreauto:IMX_CONFIG=board/freescale/mx6qsabreauto/imximage.cfg,MX6Q Fabio Estevam +diff --git a/include/configs/utilite.h b/include/configs/utilite.h +new file mode 100644 +index 0000000..fb382f9 +--- /dev/null ++++ b/include/configs/utilite.h +@@ -0,0 +1,177 @@ ++/* ++ * Copyright (C) 2013 Freescale Semiconductor, Inc. ++ * ++ * Configuration settings for the Wandboard. ++ * ++ * SPDX-License-Identifier: GPL-2.0+ ++ */ ++ ++#ifndef __CONFIG_H ++#define __CONFIG_H ++ ++#include "mx6_common.h" ++#include ++#include ++#include ++ ++#define CONFIG_MX6 ++#define CONFIG_DISPLAY_CPUINFO ++#define CONFIG_DISPLAY_BOARDINFO ++ ++#define MACH_TYPE_UTILITE 4412 ++#define CONFIG_MACH_TYPE MACH_TYPE_UTILITE ++ ++#define CONFIG_CMDLINE_TAG ++#define CONFIG_SETUP_MEMORY_TAGS ++#define CONFIG_INITRD_TAG ++#define CONFIG_REVISION_TAG ++ ++/* Size of malloc() pool */ ++#define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M) ++ ++#define CONFIG_BOARD_EARLY_INIT_F ++#define CONFIG_BOARD_LATE_INIT ++#define CONFIG_MXC_GPIO ++ ++#define CONFIG_MXC_UART ++#define CONFIG_MXC_UART_BASE UART1_BASE ++ ++/* allow to overwrite serial and ethaddr */ ++#define CONFIG_ENV_OVERWRITE ++#define CONFIG_CONS_INDEX 1 ++#define CONFIG_BAUDRATE 115200 ++ ++/* Command definition */ ++#include ++ ++#undef CONFIG_CMD_IMLS ++ ++#define CONFIG_CMD_BMODE ++#define CONFIG_CMD_SETEXPR ++ ++#define CONFIG_SYS_MEMTEST_START 0x10000000 ++#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 500 * SZ_1M) ++#define CONFIG_LOADADDR 0x12000000 ++#define CONFIG_SYS_TEXT_BASE 0x17800000 ++ ++/* MMC Configuration */ ++#define CONFIG_FSL_ESDHC ++#define CONFIG_FSL_USDHC ++#define CONFIG_SYS_FSL_USDHC_NUM 2 ++#define CONFIG_SYS_FSL_ESDHC_ADDR 0 ++ ++#define CONFIG_MMC ++#define CONFIG_CMD_MMC ++#define CONFIG_GENERIC_MMC ++#define CONFIG_BOUNCE_BUFFER ++ ++/* Ethernet Configuration */ ++#define CONFIG_FEC_MXC ++#define CONFIG_MII ++#define IMX_FEC_BASE ENET_BASE_ADDR ++#define CONFIG_FEC_XCV_TYPE RGMII ++#define CONFIG_ETHPRIME "FEC" ++#define CONFIG_FEC_MXC_PHYADDR 1 ++#define CONFIG_PHYLIB ++#define CONFIG_PHY_ATHEROS ++ ++/* Framebuffer */ ++#define CONFIG_VIDEO ++#define CONFIG_VIDEO_IPUV3 ++#define CONFIG_CFB_CONSOLE ++#define CONFIG_VGA_AS_SINGLE_DEVICE ++#define CONFIG_SYS_CONSOLE_IS_IN_ENV ++#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE ++#define CONFIG_VIDEO_BMP_RLE8 ++#define CONFIG_SPLASH_SCREEN ++#define CONFIG_SPLASH_SCREEN_ALIGN ++#define CONFIG_BMP_16BPP ++#define CONFIG_VIDEO_LOGO ++#define CONFIG_VIDEO_BMP_LOGO ++#define CONFIG_IPUV3_CLK 260000000 ++#define CONFIG_IMX_HDMI ++ ++#ifndef CONFIG_SPL_BUILD ++#include ++#include ++#endif ++ ++#if defined(CONFIG_MX6DL) || defined(CONFIG_MX6S) ++#define CONFIG_DEFAULT_FDT_FILE "imx6dl-cm-fx6.dtb" ++#elif defined(CONFIG_MX6Q) ++#define CONFIG_DEFAULT_FDT_FILE "imx6q-cm-fx6.dtb" ++#endif ++ ++#define CONFIG_EXTRA_ENV_SETTINGS \ ++ "script=boot.scr\0" \ ++ "image=zImage\0" \ ++ "console=ttymxc3,115200\0" \ ++ "splashpos=m,m\0" \ ++ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ ++ "fdt_addr_r=0x18000000\0" \ ++ "boot_fdt=try\0" \ ++ "pxefile_addr_r=0x17f00000\0" \ ++ "scriptaddr=0x17e00000\0" \ ++ "kernel_addr_r=0x11000000\0" \ ++ "ramdisk_addr_r=0x18100000\0" \ ++ "bootm_size=0x20000000\0" \ ++ "ip_dyn=yes\0" \ ++ "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \ ++ "mmcpart=1\0" \ ++ "mmcroot=/dev/mmcblk0p2 rootwait rw\0" \ ++ "update_sd_firmware_filename=u-boot.imx\0" \ ++ "update_sd_firmware=" \ ++ "if test ${ip_dyn} = yes; then " \ ++ "setenv get_cmd dhcp; " \ ++ "else " \ ++ "setenv get_cmd tftp; " \ ++ "fi; " \ ++ "if mmc dev ${mmcdev}; then " \ ++ "if ${get_cmd} ${update_sd_firmware_filename}; then " \ ++ "setexpr fw_sz ${filesize} / 0x200; " \ ++ "setexpr fw_sz ${fw_sz} + 1; " \ ++ "mmc write ${loadaddr} 0x2 ${fw_sz}; " \ ++ "fi; " \ ++ "fi\0" \ ++ BOOTCMDS_COMMON ++ ++#define CONFIG_BOOTCOMMAND \ ++ "for target in ${boot_targets}; do run bootcmd_${target}; done" ++ ++/* Miscellaneous configurable options */ ++#define CONFIG_SYS_CBSIZE 256 ++ ++/* Print Buffer Size */ ++#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16) ++#define CONFIG_SYS_MAXARGS 16 ++#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE ++ ++#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR ++ ++/* Physical Memory Map */ ++#define CONFIG_NR_DRAM_BANKS 1 ++#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR ++ ++#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM ++#define CONFIG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR ++#define CONFIG_SYS_INIT_RAM_SIZE IRAM_SIZE ++ ++#define CONFIG_SYS_INIT_SP_OFFSET \ ++ (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE) ++#define CONFIG_SYS_INIT_SP_ADDR \ ++ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) ++ ++/* FLASH and environment organization */ ++#define CONFIG_SYS_NO_FLASH ++ ++#define CONFIG_ENV_SIZE (8 * 1024) ++ ++#define CONFIG_ENV_IS_IN_MMC ++#define CONFIG_ENV_OFFSET (6 * 64 * 1024) ++#define CONFIG_SYS_MMC_ENV_DEV 0 ++ ++#ifndef CONFIG_SYS_DCACHE_OFF ++#define CONFIG_CMD_CACHE ++#endif ++ ++#endif /* __CONFIG_H * */ +-- +1.9.0 + diff --git a/0013-cleanups-to-make-panda-and-beaglebone-work.patch b/0013-cleanups-to-make-panda-and-beaglebone-work.patch deleted file mode 100644 index 41082bf..0000000 --- a/0013-cleanups-to-make-panda-and-beaglebone-work.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 1138de5f8cd27f376186058a4eb791262e4592c4 Mon Sep 17 00:00:00 2001 -From: Dennis Gilmore -Date: Wed, 19 Mar 2014 18:09:42 -0500 -Subject: [PATCH 13/13] cleanups to make panda and beaglebone work - ---- - include/configs/am335x_evm.h | 2 +- - include/configs/ti_omap4_common.h | 5 ++++- - 2 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h -index a291a2f..1dd4486 100644 ---- a/include/configs/am335x_evm.h -+++ b/include/configs/am335x_evm.h -@@ -140,7 +140,7 @@ - - #define CONFIG_BOOTCOMMAND \ - "run findfdt; " \ -- "for target in ${boot_targets}; do run bootcmd_${target}; done" \ -+ "for target in ${boot_targets}; do run bootcmd_${target}; done " \ - "run nandboot;" - - /* NS16550 Configuration */ -diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h -index eb3240a..f9baa50 100644 ---- a/include/configs/ti_omap4_common.h -+++ b/include/configs/ti_omap4_common.h -@@ -86,6 +86,7 @@ - /* - * Environment setup - */ -+#ifndef CONFIG_SPL_BUILD - #define CONFIG_EXTRA_ENV_SETTINGS \ - DEFAULT_LINUX_BOOT_ENV \ - "console=ttyO2,115200n8\0" \ -@@ -124,10 +125,12 @@ - "if test $fdtfile = undefined; then " \ - "echo WARNING: Could not determine device tree to use; fi; \0" \ - "loadfdt=load mmc ${bootpart} ${fdt_addr_r} ${bootdir}/${fdtfile}\0" \ -+ BOOTCMDS_COMMON -+#endif - - #define CONFIG_BOOTCOMMAND \ - "run findfdt; " \ -- "for target in ${boot_targets}; do run bootcmd_${target}; done" -+ "for target in ${boot_targets}; do run bootcmd_${target}; done " - /* - * Defines for SPL - * It is known that this will break HS devices. Since the current size of --- -1.9.0 - diff --git a/0014-add-to-ti_armv7_common.h-generic-distro-environment-.patch b/0014-add-to-ti_armv7_common.h-generic-distro-environment-.patch new file mode 100644 index 0000000..d7af853 --- /dev/null +++ b/0014-add-to-ti_armv7_common.h-generic-distro-environment-.patch @@ -0,0 +1,29 @@ +From f972c558cbf06331f0738946304a0cca3e163d85 Mon Sep 17 00:00:00 2001 +From: Dennis Gilmore +Date: Mon, 21 Apr 2014 12:35:27 -0500 +Subject: [PATCH 14/14] add to ti_armv7_common.h generic distro environment + variables + +there are two new environment variables and addresses that need +to be set for generic distro support, add them into the common ti +environment. +--- + include/configs/ti_armv7_common.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h +index fda99fb..656d939 100644 +--- a/include/configs/ti_armv7_common.h ++++ b/include/configs/ti_armv7_common.h +@@ -53,6 +53,8 @@ + #define DEFAULT_LINUX_BOOT_ENV \ + "loadaddr=0x82000000\0" \ + "kernel_addr_r=0x82000000\0" \ ++ "pxe_addr_r=0x87F00000\0" \ ++ "scriptaddr=0x87E00000\0" \ + "fdtaddr=0x88000000\0" \ + "fdt_addr_r=0x88000000\0" \ + "rdaddr=0x88080000\0" \ +-- +1.9.0 + diff --git a/sources b/sources index c585a32..4f255a3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4117da4f61dabb1c417dbb2e48f2afb7 u-boot-2014.04-rc2.tar.bz2 +6d2116d1385a66e9a59742caa9d62a54 u-boot-2014.04.tar.bz2 diff --git a/uboot-tools.spec b/uboot-tools.spec index 5e5558f..5c9072a 100644 --- a/uboot-tools.spec +++ b/uboot-tools.spec @@ -1,8 +1,8 @@ -%global candidate rc2 +#global candidate Name: uboot-tools Version: 2014.04 -Release: 0.4%{?candidate:.%{candidate}}%{?dist} +Release: 1%{?candidate:.%{candidate}}%{?dist} Summary: U-Boot utilities Group: Development/Tools @@ -15,16 +15,17 @@ Patch1: u-boot-fat.patch Patch10: 0001-TI-Add-use-a-DEFAULT_LINUX_BOOT_ENV-environment-stri.patch Patch11: 0002-am335x_evm-Update-the-ramdisk-args-we-pass-things-in.patch Patch12: 0003-am43xx_evm-Update-the-ramdisk-args-we-pass-things-in.patch -Patch13: 0004-add-README.distro.patch -Patch14: 0005-add-generic-bootcmd-header.patch -Patch15: 0006-convert-wandboard-to-use-generic-boot-commands.patch -Patch16: 0007-convert-beaglebone-to-use-generic-boot-commands.patch -Patch17: 0008-convert-pandaboard-to-use-generic-boot-commands.patch -Patch18: 0009-fix-up-some-sillies.patch -Patch19: 0010-fixups-for-wandboard-to-ensure-the-environment-is-co.patch -Patch20: 0011-convert-fdt_file-to-fdtfile-globally.patch -Patch21: 0012-check-for-fdtfile-and-fdt_file-to-find-the-devicetre.patch -Patch22: 0013-cleanups-to-make-panda-and-beaglebone-work.patch +Patch13: 0004-pxe-additionaly-check-for-fdt_file-env-variable.patch +Patch14: 0005-convert-snowball-to-distro-generic-config.patch +Patch15: 0006-move-wandboard-over-to-use-the-generic-distro-config.patch +Patch16: 0007-move-udoo-over-to-use-the-generic-distro-configuatio.patch +Patch17: 0008-move-pandaboard-over-to-use-the-generic-distro-confi.patch +Patch18: 0009-move-beaglebone-over-to-use-the-generic-distro-confi.patch +Patch19: 0010-add-header-with-a-generic-set-of-boot-commands-defin.patch +Patch20: 0011-add-README.distro-file.patch +Patch21: 0012-cleanup-duplicate-options-in-paz00-config.patch +Patch22: 0013-add-hackish-utilite-build-based-on-wandboard.patch +Patch23: 0014-add-to-ti_armv7_common.h-generic-distro-environment-.patch %ifnarch %{arm} BuildRequires: gcc-arm-linux-gnu @@ -47,111 +48,43 @@ u-boot bootloader binaries for the aarch64 vexpress_aemv8a %endif %ifarch %{arm} -%package -n uboot-arndale -Summary: u-boot bootloader binaries for arndale board +%package -n uboot-images-armv7 +Summary: u-boot bootloader binaries for armv7 boards Requires: uboot-tools -%description -n uboot-arndale -u-boot bootloader binaries for arndale board +Obsoletes: uboot-arndale < %{version}-%{release} +Provides: uboot-arndale = %{version}-%{release} +Obsoletes: uboot-beagle < %{version}-%{release} +Provides: uboot-beagle = %{version}-%{release} +Obsoletes: uboot-beaglebone < %{version}-%{release} +Provides: uboot-beaglebone = %{version}-%{release} +Obsoletes: uboot-highbank < %{version}-%{release} +Provides: uboot-highbank = %{version}-%{release} +Obsoletes: uboot-panda < %{version}-%{release} +Provides: uboot-panda = %{version}-%{release} +Obsoletes: uboot-origen < %{version}-%{release} +Provides: uboot-origen = %{version}-%{release} +Obsoletes: uboot-paz00 < %{version}-%{release} +Provides: uboot-paz00 = %{version}-%{release} +Obsoletes: uboot-smdkv310 < %{version}-%{release} +Provides: uboot-smdkv310 = %{version}-%{release} +Obsoletes: uboot-snow < %{version}-%{release} +Provides: uboot-snow = %{version}-%{release} +Obsoletes: uboot-snowball < %{version}-%{release} +Provides: uboot-snowball = %{version}-%{release} +Obsoletes: uboot-trimslice < %{version}-%{release} +Provides: uboot-trimslice = %{version}-%{release} +Obsoletes: uboot-uevm < %{version}-%{release} +Provides: uboot-uevm = %{version}-%{release} +Obsoletes: uboot-wandboard_dl < %{version}-%{release} +Provides: uboot-wandboard_dl = %{version}-%{release} +Obsoletes: uboot-wandboard_quad < %{version}-%{release} +Provides: uboot-wandboard_quad = %{version}-%{release} +Obsoletes: uboot-wandboard_solo < %{version}-%{release} +Provides: uboot-wandboard_solo = %{version}-%{release} -%package -n uboot-beagle -Summary: u-boot bootloader binaries for beagleboard -Requires: uboot-tools - -%description -n uboot-beagle -u-boot bootloader binaries for beagleboard - -%package -n uboot-beaglebone -Summary: u-boot bootloader binaries for beaglebone -Requires: uboot-tools - -%description -n uboot-beaglebone -u-boot bootloader binaries for beaglebone - -%package -n uboot-highbank -Summary: u-boot bootloader binaries for calxeda highbank -Requires: uboot-tools -BuildArch: noarch - -%description -n uboot-highbank -u-boot bootloader binaries for calxeda highbank - -%package -n uboot-panda -Summary: u-boot bootloader binaries for pandaboard -Requires: uboot-tools - -%description -n uboot-panda -u-boot bootloader binaries for pandaboard - -%package -n uboot-origen -Summary: u-boot bootloader binaries for origenboard -Requires: uboot-tools - -%description -n uboot-origen -u-boot bootloader binaries for origenboard - -%package -n uboot-paz00 -Summary: u-boot bootloader binaries for the paz00 board aka ac100 -Requires: uboot-tools - -%description -n uboot-paz00 -u-boot bootloader binaries for paz00 board - -%package -n uboot-smdkv310 -Summary: u-boot bootloader binaries for smdk310 board -Requires: uboot-tools - -%description -n uboot-smdkv310 -u-boot bootloader binaries for smdk310 board - -%package -n uboot-snow -Summary: u-boot bootloader binaries for snow board aka chromebook -Requires: uboot-tools - -%description -n uboot-snow -u-boot bootloader binaries for snow board - -%package -n uboot-snowball -Summary: u-boot bootloader binaries for snowball board -Requires: uboot-tools - -%description -n uboot-snowball -u-boot bootloader binaries for snowball board - -%package -n uboot-trimslice -Summary: u-boot bootloader binaries for trimslice board -Requires: uboot-tools - -%description -n uboot-trimslice -u-boot bootloader binaries for trimslice board - -%package -n uboot-uevm -Summary: u-boot bootloader binaries for uevm, omap5 pandaboard -Requires: uboot-tools - -%description -n uboot-uevm -u-boot bootloader binaries for uevm, omap5 pandaboard - -%package -n uboot-wandboard_dl -Summary: u-boot bootloader binaries for Wandboard i.MX6 Dual Lite -Requires: uboot-tools - -%description -n uboot-wandboard_dl -u-boot bootloader binaries for Wandboard i.MX6 Dual Lite - -%package -n uboot-wandboard_quad -Summary: u-boot bootloader binaries for Wandboard i.MX6 Quad -Requires: uboot-tools - -%description -n uboot-wandboard_quad -u-boot bootloader binaries for Wandboard i.MX6 Quad - -%package -n uboot-wandboard_solo -Summary: u-boot bootloader binaries for Wandboard i.MX6 Solo -Requires: uboot-tools - -%description -n uboot-wandboard_solo -u-boot bootloader binaries for Wandboard i.MX6 Solo +%description -n uboot-images-armv7 +u-boot bootloader binaries for armv7 boards %endif @@ -172,6 +105,7 @@ u-boot bootloader binaries for Wandboard i.MX6 Solo %patch20 -p1 %patch21 -p1 %patch22 -p1 +%patch23 -p1 mkdir builds # convert fedora logo to bmp for use in u-boot @@ -188,7 +122,7 @@ done make vexpress_aemv8a_config make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} cp -p u-boot.bin builds/u-boot.bin.vexpress_aemv8a -make distclean +make mrproper %endif @@ -197,87 +131,94 @@ make am335x_evm_config make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} cp -p MLO builds/MLO.beaglebone cp -p u-boot.img builds/u-boot.img.beaglebone -make distclean +make mrproper make omap3_beagle_config make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} cp -p MLO builds/MLO.beagle cp -p u-boot.img builds/u-boot.img.beagle -make distclean +make mrproper make arndale_config make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} cp -p spl/arndale-spl.bin builds/arndale-spl.bin.arndale cp -p u-boot-dtb.bin builds/u-boot-dtb.bin.arndale -make distclean +make mrproper make highbank_config make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} cp -p u-boot.bin builds/u-boot.bin.highbank -make distclean +make mrproper make omap4_panda_config make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} cp -p MLO builds/MLO.panda cp -p u-boot.img builds/u-boot.img.panda -make distclean +make mrproper make origen_config make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} cp -p spl/origen-spl.bin builds/origen-spl.bin.origen cp -p u-boot.bin builds/u-boot.bin.origen -make distclean +make mrproper make paz00_config make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} cp -p u-boot-dtb-tegra.bin builds/u-boot-dtb-tegra.bin.paz00 cp -p u-boot-nodtb-tegra.bin builds/u-boot-nodtb-tegra.bin.paz00 cp -p u-boot.map builds/u-boot.map.paz00 -make distclean +cp -p u-boot.dtb builds/u-boot.dtb.paz00 +make mrproper make smdkv310_config make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} cp -p spl/smdkv310-spl.bin builds/smdkv310-spl.bin.smdkv310 cp -p u-boot.bin builds/u-boot.bin.smdkv310 -make distclean +make mrproper make snow_config make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} cp -p u-boot-dtb.bin builds/u-boot-dtb.bin.snow -make distclean +make mrproper make snowball_config make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} cp -p u-boot.bin builds/u-boot.bin.snowball -make distclean +make mrproper make trimslice_config make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} cp -p u-boot-dtb-tegra.bin builds/u-boot-dtb-tegra.bin.trimslice cp -p u-boot-nodtb-tegra.bin builds/u-boot-nodtb-tegra.bin.trimslice cp -p u-boot.map builds/u-boot.map.trimslice -make distclean +cp -p u-boot.dtb builds/u-boot.dtb.trimslice +make mrproper make wandboard_dl_config make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} cp -p u-boot.imx builds/u-boot.imx.wbdl -make distclean +make mrproper make wandboard_quad_config make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} cp -p u-boot.imx builds/u-boot.imx.wbquad -make distclean +make mrproper + +make udoo_quad_config +make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} +cp -p u-boot.imx builds/u-boot.imx.udoo_quad +make mrproper make wandboard_solo_config make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} cp -p u-boot.imx builds/u-boot.imx.wbsolo -make distclean +make mrproper make omap5_uevm_config make HOSTCC="gcc $RPM_OPT_FLAGS" CROSS_COMPILE="" %{?_smp_mflags} cp -p MLO builds/MLO.uevm cp -p u-boot.img builds/u-boot.img.uevm -make distclean +make mrproper %endif %ifnarch %{arm} @@ -306,8 +247,6 @@ install -p -m 0644 builds/u-boot.bin.vexpress_aemv8a $RPM_BUILD_ROOT%{_datadir}/ %ifarch %{arm} mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/ -install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/uboot/uEnv.txt - mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/arndale/ mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/beagle/ mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/beaglebone/ @@ -322,6 +261,7 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/trimslice/ mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/wandboard_dl/ mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/wandboard_quad/ mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/wandboard_solo/ +mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/udoo_quad/ mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/uevm/ mkdir -p $RPM_BUILD_ROOT%{_datadir}/uboot/vexpress/ @@ -336,6 +276,7 @@ do install -p -m 0644 builds/u-boot-nodtb-tegra.bin.$(echo $board) $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/u-boot-nodtb-tegra.bin install -p -m 0644 builds/u-boot-dtb-tegra.bin.$(echo $board) $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/u-boot-dtb-tegra.bin install -p -m 0644 builds/u-boot.map.$(echo $board) $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/u-boot.map +install -p -m 0644 builds/u-boot.dtb.$(echo $board) $RPM_BUILD_ROOT%{_datadir}/uboot/$(echo $board)/u-boot.dtb done install -p -m 0644 builds/arndale-spl.bin.arndale $RPM_BUILD_ROOT%{_datadir}/uboot/arndale/arndale-spl.bin @@ -352,6 +293,8 @@ install -p -m 0644 builds/u-boot.bin.smdkv310 $RPM_BUILD_ROOT%{_datadir}/uboot/s install -p -m 0644 builds/u-boot-dtb.bin.snow $RPM_BUILD_ROOT%{_datadir}/uboot/snow/u-boot-dtb.bin install -p -m 0644 builds/u-boot.bin.snowball $RPM_BUILD_ROOT%{_datadir}/uboot/snowball/u-boot.bin +install -p -m 0644 builds/u-boot.imx.udoo_quad $RPM_BUILD_ROOT%{_datadir}/uboot/udoo_quad/u-boot.imx + install -p -m 0644 builds/u-boot.imx.wbdl $RPM_BUILD_ROOT%{_datadir}/uboot/wandboard_dl/u-boot.imx install -p -m 0644 builds/u-boot.imx.wbquad $RPM_BUILD_ROOT%{_datadir}/uboot/wandboard_quad/u-boot.imx install -p -m 0644 builds/u-boot.imx.wbsolo $RPM_BUILD_ROOT%{_datadir}/uboot/wandboard_solo/u-boot.imx @@ -377,81 +320,44 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/mkimage.1* %ifarch %{arm} %dir %{_datadir}/uboot/ -%{_datadir}/uboot/uEnv.txt %{_bindir}/fw_printenv %{_bindir}/fw_setenv %config(noreplace) %{_sysconfdir}/fw_env.config %endif %ifarch aarch64 -%files -n uboot-vexpress_aemv8a +%files -n uboot-images-armv8 %defattr(-,root,root,-) %{_datadir}/uboot/vexpress_aemv8a/ %endif %ifarch %{arm} -%files -n uboot-arndale +%files -n uboot-images-armv7 %defattr(-,root,root,-) %{_datadir}/uboot/arndale/ - -%files -n uboot-beaglebone -%defattr(-,root,root,-) %{_datadir}/uboot/beaglebone/ - -%files -n uboot-beagle -%defattr(-,root,root,-) %{_datadir}/uboot/beagle/ - -%files -n uboot-highbank -%defattr(-,root,root,-) %{_datadir}/uboot/highbank/ - -%files -n uboot-panda -%defattr(-,root,root,-) %{_datadir}/uboot/panda/ - -%files -n uboot-paz00 -%defattr(-,root,root,-) %{_datadir}/uboot/paz00/ - -%files -n uboot-origen -%defattr(-,root,root,-) %{_datadir}/uboot/origen/ - -%files -n uboot-snow -%defattr(-,root,root,-) %{_datadir}/uboot/snow/ - -%files -n uboot-snowball -%defattr(-,root,root,-) %{_datadir}/uboot/snowball/ - -%files -n uboot-smdkv310 -%defattr(-,root,root,-) %{_datadir}/uboot/smdkv310/ - -%files -n uboot-trimslice -%defattr(-,root,root,-) %{_datadir}/uboot/trimslice/ - -%files -n uboot-wandboard_dl -%defattr(-,root,root,-) %{_datadir}/uboot/wandboard_dl/ - -%files -n uboot-wandboard_quad -%defattr(-,root,root,-) %{_datadir}/uboot/wandboard_quad/ - -%files -n uboot-wandboard_solo -%defattr(-,root,root,-) %{_datadir}/uboot/wandboard_solo/ - -%files -n uboot-uevm -%defattr(-,root,root,-) +%{_datadir}/uboot/udoo_quad/ %{_datadir}/uboot/uevm/ %endif %changelog +* Mon Apr 21 2014 Dennis Gilmore - 2014.04-1 +- update to final 2014.04 +- put all images into a single rpm +- add udoo image + * Wed Mar 19 2014 Dennis Gilmore - 2014.04-0.4.rc2 - apply fixes for panda and beaglebone