[U-Boot] [PATCH 1/3] am335x_evm.h: unsed CONFIG_BOOTDELAY
Now that ti_armv7_common.h uses config_distro_defaults.h we don't need to include it again and then undef CONFIG_BOOTDELAY
Signed-off-by: Tom Rini trini@konsulko.com --- include/configs/am335x_evm.h | 4 ---- 1 file changed, 4 deletions(-)
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index c51db8c..cf6a606 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -18,10 +18,6 @@
#include <configs/ti_am335x_common.h>
-/* Don't override the distro default bootdelay */ -#undef CONFIG_BOOTDELAY -#include <config_distro_defaults.h> - #ifndef CONFIG_SPL_BUILD #ifndef CONFIG_FIT # define CONFIG_FIT
Given that with config_distro_defaults.h we always have ext4 read support, add in write support.
Signed-off-by: Tom Rini trini@konsulko.com --- include/configs/ti_armv7_common.h | 1 + 1 file changed, 1 insertion(+)
diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index 2087eb19..199612b 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -283,5 +283,6 @@ #endif
#include <config_distro_defaults.h> +#define CONFIG_CMD_EXT4_WRITE
#endif /* __CONFIG_TI_ARMV7_COMMON_H__ */
On Thu, Dec 10, 2015 at 04:46:02PM -0500, Tom Rini wrote:
Given that with config_distro_defaults.h we always have ext4 read support, add in write support.
Signed-off-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!
Based on the am335x_evm conversion, switch to config_distro_bootcmd for mmc and pxe. Tested with Fedora 23.
Signed-off-by: Tom Rini trini@konsulko.com --- include/configs/ti_omap4_common.h | 51 ++++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 24 deletions(-)
diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h index 08130eb..8b6c065 100644 --- a/include/configs/ti_omap4_common.h +++ b/include/configs/ti_omap4_common.h @@ -82,6 +82,32 @@ /* * Environment setup */ +#define BOOTENV_DEV_LEGACY_MMC(devtypeu, devtypel, instance) \ + "bootcmd_" #devtypel #instance "=" \ + "setenv mmcdev " #instance"; "\ + "setenv bootpart " #instance":2 ; "\ + "run mmcboot\0" + +#define BOOTENV_DEV_NAME_LEGACY_MMC(devtypeu, devtypel, instance) \ + #devtypel #instance " " + +#define BOOTENV_DEV_NAME_NAND(devtypeu, devtypel, instance) \ + #devtypel #instance " " + +#define BOOT_TARGET_DEVICES(func) \ + func(MMC, mmc, 0) \ + func(LEGACY_MMC, legacy_mmc, 0) \ + func(MMC, mmc, 1) \ + func(LEGACY_MMC, legacy_mmc, 1) \ + func(PXE, pxe, na) \ + func(DHCP, dhcp, na) + +#define CONFIG_BOOTCOMMAND \ + "run findfdt; " \ + "run distro_bootcmd" + +#include <config_distro_bootcmd.h> + #define CONFIG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ DEFAULT_MMC_TI_ARGS \ @@ -120,30 +146,7 @@ "if test $fdtfile = undefined; then " \ "echo WARNING: Could not determine device tree to use; fi; \0" \ "loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \ - -#define CONFIG_BOOTCOMMAND \ - "run findfdt; " \ - "mmc dev ${mmcdev}; if mmc rescan; then " \ - "echo SD/MMC found on device ${mmcdev};" \ - "if run loadbootscript; then " \ - "run bootscript; " \ - "else " \ - "if run loadbootenv; then " \ - "run importbootenv; " \ - "fi;" \ - "if test -n ${uenvcmd}; then " \ - "echo Running uenvcmd ...;" \ - "run uenvcmd;" \ - "fi;" \ - "fi;" \ - "if run loadimage; then " \ - "run loadfdt;" \ - "run mmcboot; " \ - "fi; " \ - "if run loaduimage; then " \ - "run uimageboot;" \ - "fi; " \ - "fi" + BOOTENV
/* * Defines for SPL
On Thu, Dec 10, 2015 at 3:46 PM, Tom Rini trini@konsulko.com wrote:
Based on the am335x_evm conversion, switch to config_distro_bootcmd for mmc and pxe. Tested with Fedora 23.
Signed-off-by: Tom Rini trini@konsulko.com
include/configs/ti_omap4_common.h | 51 ++++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 24 deletions(-)
diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h index 08130eb..8b6c065 100644 --- a/include/configs/ti_omap4_common.h +++ b/include/configs/ti_omap4_common.h @@ -82,6 +82,32 @@ /*
- Environment setup
*/ +#define BOOTENV_DEV_LEGACY_MMC(devtypeu, devtypel, instance) \
"bootcmd_" #devtypel #instance "=" \"setenv mmcdev " #instance"; "\"setenv bootpart " #instance":2 ; "\"run mmcboot\0"+#define BOOTENV_DEV_NAME_LEGACY_MMC(devtypeu, devtypel, instance) \
#devtypel #instance " "+#define BOOTENV_DEV_NAME_NAND(devtypeu, devtypel, instance) \
#devtypel #instance " "+#define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 0) \func(LEGACY_MMC, legacy_mmc, 0) \func(MMC, mmc, 1) \func(LEGACY_MMC, legacy_mmc, 1) \
I don't remember the panda having a 2nd mmc card slot, are there other omap4's with this feature?
Regards,
On Thu, Dec 10, 2015 at 4:58 PM, Robert Nelson robertcnelson@gmail.com wrote:
On Thu, Dec 10, 2015 at 3:46 PM, Tom Rini trini@konsulko.com wrote:
Based on the am335x_evm conversion, switch to config_distro_bootcmd for mmc and pxe. Tested with Fedora 23.
Signed-off-by: Tom Rini trini@konsulko.com
include/configs/ti_omap4_common.h | 51 ++++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 24 deletions(-)
diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h index 08130eb..8b6c065 100644 --- a/include/configs/ti_omap4_common.h +++ b/include/configs/ti_omap4_common.h @@ -82,6 +82,32 @@ /*
- Environment setup
*/ +#define BOOTENV_DEV_LEGACY_MMC(devtypeu, devtypel, instance) \
"bootcmd_" #devtypel #instance "=" \"setenv mmcdev " #instance"; "\"setenv bootpart " #instance":2 ; "\"run mmcboot\0"+#define BOOTENV_DEV_NAME_LEGACY_MMC(devtypeu, devtypel, instance) \
#devtypel #instance " "+#define BOOTENV_DEV_NAME_NAND(devtypeu, devtypel, instance) \
#devtypel #instance " "+#define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 0) \func(LEGACY_MMC, legacy_mmc, 0) \func(MMC, mmc, 1) \func(LEGACY_MMC, legacy_mmc, 1) \I don't remember the panda having a 2nd mmc card slot, are there other omap4's with this feature?
ahh the omap4-sdp did, since this is ti_omap4_common.h that's fine..
Regards,
On Thu, Dec 10, 2015 at 05:01:25PM -0600, Robert Nelson wrote:
On Thu, Dec 10, 2015 at 4:58 PM, Robert Nelson robertcnelson@gmail.com wrote:
On Thu, Dec 10, 2015 at 3:46 PM, Tom Rini trini@konsulko.com wrote:
Based on the am335x_evm conversion, switch to config_distro_bootcmd for mmc and pxe. Tested with Fedora 23.
Signed-off-by: Tom Rini trini@konsulko.com
include/configs/ti_omap4_common.h | 51 ++++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 24 deletions(-)
diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h index 08130eb..8b6c065 100644 --- a/include/configs/ti_omap4_common.h +++ b/include/configs/ti_omap4_common.h @@ -82,6 +82,32 @@ /*
- Environment setup
*/ +#define BOOTENV_DEV_LEGACY_MMC(devtypeu, devtypel, instance) \
"bootcmd_" #devtypel #instance "=" \"setenv mmcdev " #instance"; "\"setenv bootpart " #instance":2 ; "\"run mmcboot\0"+#define BOOTENV_DEV_NAME_LEGACY_MMC(devtypeu, devtypel, instance) \
#devtypel #instance " "+#define BOOTENV_DEV_NAME_NAND(devtypeu, devtypel, instance) \
#devtypel #instance " "+#define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 0) \func(LEGACY_MMC, legacy_mmc, 0) \func(MMC, mmc, 1) \func(LEGACY_MMC, legacy_mmc, 1) \I don't remember the panda having a 2nd mmc card slot, are there other omap4's with this feature?
ahh the omap4-sdp did, since this is ti_omap4_common.h that's fine..
Even better, we'll pretend I did it right to start with :)
On Thu, Dec 10, 2015 at 04:58:17PM -0600, Robert Nelson wrote:
On Thu, Dec 10, 2015 at 3:46 PM, Tom Rini trini@konsulko.com wrote:
Based on the am335x_evm conversion, switch to config_distro_bootcmd for mmc and pxe. Tested with Fedora 23.
Signed-off-by: Tom Rini trini@konsulko.com
include/configs/ti_omap4_common.h | 51 ++++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 24 deletions(-)
diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h index 08130eb..8b6c065 100644 --- a/include/configs/ti_omap4_common.h +++ b/include/configs/ti_omap4_common.h @@ -82,6 +82,32 @@ /*
- Environment setup
*/ +#define BOOTENV_DEV_LEGACY_MMC(devtypeu, devtypel, instance) \
"bootcmd_" #devtypel #instance "=" \"setenv mmcdev " #instance"; "\"setenv bootpart " #instance":2 ; "\"run mmcboot\0"+#define BOOTENV_DEV_NAME_LEGACY_MMC(devtypeu, devtypel, instance) \
#devtypel #instance " "+#define BOOTENV_DEV_NAME_NAND(devtypeu, devtypel, instance) \
#devtypel #instance " "+#define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 0) \func(LEGACY_MMC, legacy_mmc, 0) \func(MMC, mmc, 1) \func(LEGACY_MMC, legacy_mmc, 1) \I don't remember the panda having a 2nd mmc card slot, are there other omap4's with this feature?
Ah, good spotting, oops, will fix in v2.
On Thu, Dec 10, 2015 at 04:46:03PM -0500, Tom Rini wrote:
Based on the am335x_evm conversion, switch to config_distro_bootcmd for mmc and pxe. Tested with Fedora 23.
Signed-off-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!
On Thu, Dec 10, 2015 at 10:46 PM, Tom Rini trini@konsulko.com wrote:
Based on the am335x_evm conversion, switch to config_distro_bootcmd for mmc and pxe. Tested with Fedora 23.
Signed-off-by: Tom Rini trini@konsulko.com
include/configs/ti_omap4_common.h | 51 ++++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 24 deletions(-)
diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h
[snip]
-#define CONFIG_BOOTCOMMAND \
"run findfdt; " \"mmc dev ${mmcdev}; if mmc rescan; then " \"echo SD/MMC found on device ${mmcdev};" \"if run loadbootscript; then " \"run bootscript; " \"else " \"if run loadbootenv; then " \"run importbootenv; " \"fi;" \"if test -n ${uenvcmd}; then " \"echo Running uenvcmd ...;" \"run uenvcmd;" \"fi;" \"fi;" \"if run loadimage; then " \"run loadfdt;" \"run mmcboot; " \"fi; " \
This breaks legacy boot on pandaboard here. In Buildroot we have the kernel + dtb in partition 0:2 and no custom boot script, which used to be handled by the loadimage stuff, but that is no longer called.
On Thu, Dec 10, 2015 at 04:46:01PM -0500, Tom Rini wrote:
Now that ti_armv7_common.h uses config_distro_defaults.h we don't need to include it again and then undef CONFIG_BOOTDELAY
Signed-off-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!
participants (3)
-
Peter Korsgaard -
Robert Nelson -
Tom Rini