env: Kconfig: cosmetics: update comment for SYS_RELOC_GD_ENV_ADDR

[oweals/u-boot.git] / include / configs / uniphier.h

diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h
index 68568f412245f102f9649cc24a2f9b9f6dab1557..55fa85ed625686401ee7ea9c1b7344595ddc7ea9 100644 (file)
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -72,10 +72,6 @@
 /* Boot Argument Buffer Size */
 #define CONFIG_SYS_BARGSIZE            (CONFIG_SYS_CBSIZE)
 
-#define CONFIG_ENV_OFFSET                      0x100000
-#define CONFIG_ENV_SIZE                                0x2000
-/* #define CONFIG_ENV_OFFSET_REDUND    (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) */
-
 #define CONFIG_SYS_MMC_ENV_DEV         0
 #define CONFIG_SYS_MMC_ENV_PART                1
 
@@ -164,6 +160,7 @@
        "emmcboot=mmcsetn && run bootcmd_mmc${mmc_first_dev}\0" \
        "nandboot=run bootcmd_ubifs0\0" \
        "norboot=run tftpboot\0" \
+       "sdboot=sdsetn && run bootcmd_mmc${sd_first_dev}\0" \
        "usbboot=run bootcmd_usb0\0" \
        "emmcscript=setenv devtype mmc && " \
                "mmcsetn && " \
@@ -173,17 +170,21 @@
                "ubi part UBI && " \
                "ubifsmount ubi0:boot && " \
                "ubifsload ${loadaddr} ${script} && " \
-               "source\0" \
+               "source $loadaddr\0" \
+       "sdscript=setenv devtype mmc && " \
+               "sdsetn && " \
+               "setenv devnum ${sd_first_dev} && " \
+               "run loadscript_fat\0" \
        "norscript=echo Running ${script} from tftp ... && " \
                "tftpboot ${script} &&" \
-               "source\0" \
+               "source $loadaddr\0" \
        "usbscript=usb start && " \
                "setenv devtype usb && " \
                "setenv devnum 0 && " \
                "run loadscript_fat\0" \
        "loadscript_fat=echo Running ${script} from ${devtype}${devnum} ... && " \
                "load ${devtype} ${devnum}:1 ${loadaddr} ${script} && " \
-               "source\0" \
+               "source $loadaddr\0" \
        "sramupdate=setexpr tmp_addr $nor_base + 0x50000 &&"    \
                "tftpboot $tmp_addr $second_image && " \
                "setexpr tmp_addr $nor_base + 0x70000 && " \
@@ -200,6 +201,12 @@
                "nand write $loadaddr 0 0x00020000 && " \
                "tftpboot $third_image && " \
                "nand write $loadaddr 0x00020000 0x001e0000\0" \
+       "sdupdate=sdsetn &&" \
+               "mmc dev $sd_first_dev &&" \
+               "tftpboot $second_image && " \
+               "mmc write $loadaddr 0 100 && " \
+               "tftpboot $third_image && " \
+               "mmc write $loadaddr 100 f00\0" \
        "usbupdate=usb start &&" \
                "tftpboot $second_image && " \
                "usb write $loadaddr 0 100 && " \