socfpga: Enable SDMMC boot for SOCFPGA U-Boot
PATCH 1/1 socfpga: Enable SDMMC boot for SOCFPGA U-Boot
To enable the SDMMC boot as default boot for SOCFPGA U-Boot dev kit. Enabled the bootz command as zImage is used instead uImage.
Signed-off-by Chin Liang See <[email protected]>
Cc Dinh Nguyen <[email protected]>
Cc Pavel Machek <[email protected]>
Cc Marek Vasut <[email protected]>
Cc Tom Rini <[email protected]>
Cc Albert Aribaud <[email protected]>
Cc Wolfgang Denk <[email protected]>
--- include/configs/socfpga_cyclone5.h | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-)
include/configs/socfpga_cyclone5.h +17 -3
@@ -93,6 +93,8 @@#include <config_cmd_default.h> /* FAT file system support */ #define CONFIG_CMD_FAT +/* bootz command support */ +#define CONFIG_CMD_BOOTZ /*
@@ -117,24 +119,36 @@#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "#define CONFIG_CMD_RUN +#ifdef CONFIG_SOCFPGA_VIRTUAL_TARGET #define CONFIG_BOOTCOMMAND "run ramboot" +#else +#define CONFIG_BOOTCOMMAND "run mmcload; run mmcboot" +#endif /* * arguments passed to the bootm command. The value of * CONFIG_BOOTARGS goes into the environment value "bootargs". * Do note the value will overide also the chosen node in FDT blob. */ -#define CONFIG_BOOTARGS "console=ttyS0,57600,mem=256M at 0x0" +#define CONFIG_BOOTARGS "console=ttyS0," __stringify(CONFIG_BAUDRATE)#define CONFIG_EXTRA_ENV_SETTINGS \ "verify=n\0" \ "loadaddr= " __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "ramboot=setenv bootargs " CONFIG_BOOTARGS ";" \ "bootm ${loadaddr} - ${fdt_addr}\0" \ - "bootimage=uImage\0" \ + "bootimage=zImage\0" \ "fdt_addr=100\0" \ + "fdtimage=socfpga.dtb\0" \ "fsloadcmd=ext2load\0" \ - "bootm ${loadaddr} - ${fdt_addr}\0" \ + "bootm ${loadaddr} - ${fdt_addr}\0" \ + "mmcroot=/dev/mmcblk0p2\0" \ + "mmcboot=setenv bootargs " CONFIG_BOOTARGS \ + " root=${mmcroot} rw rootwait;" \ + "bootz ${loadaddr} - ${fdt_addr}\0" \ + "mmcload=mmc rescan;" \ + "fatload mmc 0:1 ${loadaddr} ${bootimage};" \ + "fatload mmc 0:1 ${fdt_addr} ${fdtimage}\0" \ "qspiroot=/dev/mtdblock0\0" \ "qspirootfstype=jffs2\0" \ "qspiboot=setenv bootargs " CONFIG_BOOTARGS \
Signature · 1 line
1.7.9.5
PATCH 1/1 socfpga: Enable SDMMC boot for SOCFPGA U-Boot
Quoted 56 lines · Chin Liang See
To enable the SDMMC boot as default boot for SOCFPGA U-Boot dev kit. Enabled the bootz command as zImage is used instead uImage.
Signed-off-by Chin Liang See <[email protected]>Cc Dinh Nguyen <[email protected]>Cc Pavel Machek <[email protected]>Cc Marek Vasut <[email protected]>Cc Tom Rini <[email protected]>Cc Albert Aribaud <[email protected]>Cc Wolfgang Denk <[email protected]>--- include/configs/socfpga_cyclone5.h | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-)(quoted diff) +0
-0
b/include/configs/socfpga_cyclone5.hindex f9fafac..3d1b78f 100644include/configs/socfpga_cyclone5.h +9
-2@@ -93,6 +93,8 @@#include <config_cmd_default.h> /* FAT file system support */ #define CONFIG_CMD_FAT +/* bootz command support */ +#define CONFIG_CMD_BOOTZ /* @@ -117,24 +119,36 @@#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "#define CONFIG_CMD_RUN +#ifdef CONFIG_SOCFPGA_VIRTUAL_TARGET #define CONFIG_BOOTCOMMAND "run ramboot" +#else +#define CONFIG_BOOTCOMMAND "run mmcload; run mmcboot" +#endif /* * arguments passed to the bootm command. The value of * CONFIG_BOOTARGS goes into the environment value "bootargs". * Do note the value will overide also the chosen node in FDT blob. */ -#define CONFIG_BOOTARGS "console=ttyS0,57600,mem=256M at 0x0" +#define CONFIG_BOOTARGS "console=ttyS0," __stringify(CONFIG_BAUDRATE)#define CONFIG_EXTRA_ENV_SETTINGS \ "verify=n\0" \ "loadaddr= " __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ "ramboot=setenv bootargs " CONFIG_BOOTARGS ";" \ "bootm ${loadaddr} - ${fdt_addr}\0" \ - "bootimage=uImage\0" \ + "bootimage=zImage\0" \"fdt_addr=100\0" \ +"fdtimage=socfpga.dtb\0" \
include/configs/socfpga_cyclone5.h line 152
Quoted 10 lines
include/configs/socfpga_cyclone5.h +8
-1"fsloadcmd=ext2load\0" \ -"bootm ${loadaddr} - ${fdt_addr}\0" \ +"bootm ${loadaddr} - ${fdt_addr}\0" \ +"mmcroot=/dev/mmcblk0p2\0" \ +"mmcboot=setenv bootargs " CONFIG_BOOTARGS \ +" root=${mmcroot} rw rootwait;" \ +"bootz ${loadaddr} - ${fdt_addr}\0" \ +"mmcload=mmc rescan;" \ +"fatload mmc 0:1 ${loadaddr} ${bootimage};" \ +"fatload mmc 0:1 ${fdt_addr} ${fdtimage}\0" \
This doesn't scale, we should start using CONFIG_CMD_FS_GENERIC + the "load" command. I'll cook a patch for that and submit it alongside V2 of the patches.
Quoted 3 lines
include/configs/socfpga_cyclone5.h +0
-0"qspiroot=/dev/mtdblock0\0" \"qspirootfstype=jffs2\0" \"qspiboot=setenv bootargs "
CONFIG_BOOTARGS\
Best regards,
Marek Vasut