sunxi: Add a bootcmd_sunxi_compat to the default environment to boot old kernels
authorHans de Goede <hdegoede@redhat.com>
Fri, 9 Oct 2015 16:11:15 +0000 (17:11 +0100)
committerHans de Goede <hdegoede@redhat.com>
Tue, 20 Oct 2015 16:40:28 +0000 (18:40 +0200)
Add a bootcmd_sunxi_compat value to the default environment when building
with CONFIG_OLD_SUNXI_KERNEL_COMPAT, this way people who occasionally want
to boot an old kernel can do so by simply typing "run bootcmd_sunxi_compat"
rather then needing to have 2 separate setups / sdcards for old and
new kernels.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Ian Campbell <ijc@hellion.org.uk>
include/configs/sunxi-common.h

index ed7879aad5ed6a129a0c3f3484fb61ecb2030595..879d0f42385f447037025f7b5b3837466e7ce80d 100644 (file)
@@ -435,6 +435,22 @@ extern int soft_i2c_gpio_scl;
        func(PXE, pxe, na) \
        func(DHCP, dhcp, na)
 
+#ifdef CONFIG_OLD_SUNXI_KERNEL_COMPAT
+#define BOOTCMD_SUNXI_COMPAT \
+       "bootcmd_sunxi_compat=" \
+               "setenv root /dev/mmcblk0p3 rootwait; " \
+               "if ext2load mmc 0 0x44000000 uEnv.txt; then " \
+                       "echo Loaded environment from uEnv.txt; " \
+                       "env import -t 0x44000000 ${filesize}; " \
+               "fi; " \
+               "setenv bootargs console=${console} root=${root} ${extraargs}; " \
+               "ext2load mmc 0 0x43000000 script.bin && " \
+               "ext2load mmc 0 0x48000000 uImage && " \
+               "bootm 0x48000000\0"
+#else
+#define BOOTCMD_SUNXI_COMPAT
+#endif
+
 #include <config_distro_bootcmd.h>
 
 #ifdef CONFIG_USB_KEYBOARD
@@ -465,6 +481,7 @@ extern int soft_i2c_gpio_scl;
        MEM_LAYOUT_ENV_SETTINGS \
        "fdtfile=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
        "console=ttyS0,115200\0" \
+       BOOTCMD_SUNXI_COMPAT \
        BOOTENV
 
 #else /* ifndef CONFIG_SPL_BUILD */