| Message ID | 1412374123-6787-8-git-send-email-vagrant@debian.org |
|---|---|
| State | RFC |
| Delegated to: | Tom Rini |
| Headers | show |
On Fri, 3 Oct 2014 15:08:43 -0700 Vagrant Cascadian <vagrant@debian.org> wrote: > Signed-off-by: Vagrant Cascadian <vagrant@debian.org> > --- > > include/configs/am335x_evm.h | 26 +++++++++++++++++--------- > include/configs/ti_armv7_common.h | 1 + > 2 files changed, 18 insertions(+), 9 deletions(-) > > diff --git a/include/configs/am335x_evm.h > b/include/configs/am335x_evm.h index e2f7ead..b25d990 100644 > --- a/include/configs/am335x_evm.h > +++ b/include/configs/am335x_evm.h > @@ -18,6 +18,21 @@ > > #include <configs/ti_am335x_common.h> > > +#include <config_distro_defaults.h> > + > +#define BOOTENV_BOOT_PARTITIONS "2" On Fedora we use partition 1 everywhere for /boot so this should be "1 2" though partition 2 is swap in out standard images. we really need to read the partition table and find the bootable partition. We are defaulting to telling people to put u-boot and the MLO in raw disk space. > + > +#define BOOTENV_INIT_COMMAND "run findfdt ;" > +#ifdef CONFIG_NAND > +#define BOOTENV_POST_COMMAND "run nandboot ;" > +#endif > + > +#define BOOT_TARGET_DEVICES(func) \ > + func(MMC, mmc, 0) \ > + func(MMC, mmc, 1) > + > +#include <config_distro_bootcmd.h> > + > #ifndef CONFIG_SPL_BUILD > # define CONFIG_FIT > # define CONFIG_TIMESTAMP > @@ -185,17 +200,10 @@ > "if test $fdtfile = undefined; then " \ > "echo WARNING: Could not determine device > tree to use; fi; \0" \ NANDARGS \ > - DFUARGS > + DFUARGS \ > + BOOTENV > #endif > > -#define CONFIG_BOOTCOMMAND \ > - "run findfdt; " \ > - "run mmcboot;" \ > - "setenv mmcdev 1; " \ > - "setenv bootpart 1:2; " \ > - "run mmcboot;" \ > - "run nandboot;" > - > /* NS16550 Configuration */ > #define CONFIG_SYS_NS16550_COM1 0x44e09000 /* > Base EVM has UART0 */ #define CONFIG_SYS_NS16550_COM2 > 0x48022000 /* UART1 */ diff --git > a/include/configs/ti_armv7_common.h > b/include/configs/ti_armv7_common.h index 85171db..f405fea 100644 --- > a/include/configs/ti_armv7_common.h +++ > b/include/configs/ti_armv7_common.h @@ -54,6 +54,7 @@ > #define DEFAULT_LINUX_BOOT_ENV \ > "loadaddr=0x82000000\0" \ > "kernel_addr_r=0x82000000\0" \ > + "scriptaddr=0x82000000\0" \ > "fdtaddr=0x88000000\0" \ > "fdt_addr_r=0x88000000\0" \ > "rdaddr=0x88080000\0" \
On Sat, Oct 25, 2014 at 12:22 AM, Dennis Gilmore <dennis@ausil.us> wrote: > On Fri, 3 Oct 2014 15:08:43 -0700 > Vagrant Cascadian <vagrant@debian.org> wrote: > >> Signed-off-by: Vagrant Cascadian <vagrant@debian.org> >> --- >> >> include/configs/am335x_evm.h | 26 +++++++++++++++++--------- >> include/configs/ti_armv7_common.h | 1 + >> 2 files changed, 18 insertions(+), 9 deletions(-) >> >> diff --git a/include/configs/am335x_evm.h >> b/include/configs/am335x_evm.h index e2f7ead..b25d990 100644 >> --- a/include/configs/am335x_evm.h >> +++ b/include/configs/am335x_evm.h >> @@ -18,6 +18,21 @@ >> >> #include <configs/ti_am335x_common.h> >> >> +#include <config_distro_defaults.h> >> + >> +#define BOOTENV_BOOT_PARTITIONS "2" > > On Fedora we use partition 1 everywhere for /boot so this should be "1 > 2" though partition 2 is swap in out standard images. we really need to > read the partition table and find the bootable partition. u-boot already supports looking for the (1st) bootable partition. Giving "<dev>:-" for commands will do that. I think that only works for DOS partititons, so we need to do something different for GPT partitions like looking for a certain UUID. > We are defaulting to telling people to put u-boot and the MLO in raw > disk space. Really? I'd think we'd want this to be a raw partition at least to be discoverable in some way. What the SOC ROM codes require is probably all over the map, so we can really only define what we would like to see. Rob
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index e2f7ead..b25d990 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -18,6 +18,21 @@ #include <configs/ti_am335x_common.h> +#include <config_distro_defaults.h> + +#define BOOTENV_BOOT_PARTITIONS "2" + +#define BOOTENV_INIT_COMMAND "run findfdt ;" +#ifdef CONFIG_NAND +#define BOOTENV_POST_COMMAND "run nandboot ;" +#endif + +#define BOOT_TARGET_DEVICES(func) \ + func(MMC, mmc, 0) \ + func(MMC, mmc, 1) + +#include <config_distro_bootcmd.h> + #ifndef CONFIG_SPL_BUILD # define CONFIG_FIT # define CONFIG_TIMESTAMP @@ -185,17 +200,10 @@ "if test $fdtfile = undefined; then " \ "echo WARNING: Could not determine device tree to use; fi; \0" \ NANDARGS \ - DFUARGS + DFUARGS \ + BOOTENV #endif -#define CONFIG_BOOTCOMMAND \ - "run findfdt; " \ - "run mmcboot;" \ - "setenv mmcdev 1; " \ - "setenv bootpart 1:2; " \ - "run mmcboot;" \ - "run nandboot;" - /* NS16550 Configuration */ #define CONFIG_SYS_NS16550_COM1 0x44e09000 /* Base EVM has UART0 */ #define CONFIG_SYS_NS16550_COM2 0x48022000 /* UART1 */ diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index 85171db..f405fea 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -54,6 +54,7 @@ #define DEFAULT_LINUX_BOOT_ENV \ "loadaddr=0x82000000\0" \ "kernel_addr_r=0x82000000\0" \ + "scriptaddr=0x82000000\0" \ "fdtaddr=0x88000000\0" \ "fdt_addr_r=0x88000000\0" \ "rdaddr=0x88080000\0" \
Signed-off-by: Vagrant Cascadian <vagrant@debian.org> --- include/configs/am335x_evm.h | 26 +++++++++++++++++--------- include/configs/ti_armv7_common.h | 1 + 2 files changed, 18 insertions(+), 9 deletions(-)