Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 5e7ae1afb2cc05ed84218216d0cba17625e6fc4f

Authored by Dalon Westergreen
Committed by Marek Vasut
1 parent 57b6b62f56
Exists in smarc_8mq_lf_v2020.04 and in 17 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

arm: socfpga: C5 SoCDK use environment in common header 

This removes the default environment from the C5 SoCDK headers
and instead uses the common environment provided in
socfpga_common.h which now uses distro boot.

In addition to the above, add support to boot from the custom
a2 type partition.

Change default devicetree name to match devicetree name in
upstream kernel source.

Signed-off-by: Dalon Westergreen <dwesterg@gmail.com>
Acked-by: Marek Vasut <marex@denx.de>

--
Changes in v2:
 - Remove unneeded CONFIG_BOOTFILE

Showing 2 changed files with 3 additions and 32 deletions Side-by-side Diff

configs/socfpga_cyclone5_defconfig
Diff comments   View file @ 5e7ae1a
... ... @@ -4,6 +4,7 @@
4 4 CONFIG_TARGET_SOCFPGA_CYCLONE5_SOCDK=y
5 5 CONFIG_SPL_STACK_R_ADDR=0x00800000
6 6 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socdk"
  7 +CONFIG_DEFAULT_FDT_FILE="socfpga_cyclone5_socdk.dtb"
7 8 CONFIG_FIT=y
8 9 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
9 10 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
... ... @@ -64,4 +65,6 @@
64 65 CONFIG_G_DNL_VENDOR_NUM=0x0525
65 66 CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
66 67 CONFIG_USE_TINY_PRINTF=y
  68 +CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION_TYPE=y
  69 +CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION_TYPE=0xa2
include/configs/socfpga_cyclone5_socdk.h
Diff comments   View file @ 5e7ae1a
... ... @@ -16,13 +16,6 @@
16 16 #define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB on SoCDK */
17 17  
18 18 /* Booting Linux */
19   -#define CONFIG_BOOTFILE "zImage"
20   -#define CONFIG_BOOTARGS "console=ttyS0," __stringify(CONFIG_BAUDRATE)
21   -#ifdef CONFIG_SOCFPGA_VIRTUAL_TARGET
22   -#define CONFIG_BOOTCOMMAND "run ramboot"
23   -#else
24   -#define CONFIG_BOOTCOMMAND "run mmcload; run mmcboot"
25   -#endif
26 19 #define CONFIG_LOADADDR 0x01000000
27 20 #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
28 21  
... ... @@ -33,31 +26,6 @@
33 26 #endif
34 27  
35 28 #define CONFIG_ENV_IS_IN_MMC
36   -
37   -/* Extra Environment */
38   -#define CONFIG_EXTRA_ENV_SETTINGS \
39   - "verify=n\0" \
40   - "loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
41   - "ramboot=setenv bootargs " CONFIG_BOOTARGS ";" \
42   - "bootm ${loadaddr} - ${fdt_addr}\0" \
43   - "bootimage=zImage\0" \
44   - "fdt_addr=100\0" \
45   - "fdtimage=socfpga.dtb\0" \
46   - "bootm ${loadaddr} - ${fdt_addr}\0" \
47   - "mmcroot=/dev/mmcblk0p2\0" \
48   - "mmcboot=setenv bootargs " CONFIG_BOOTARGS \
49   - " root=${mmcroot} rw rootwait;" \
50   - "bootz ${loadaddr} - ${fdt_addr}\0" \
51   - "mmcload=mmc rescan;" \
52   - "load mmc 0:1 ${loadaddr} ${bootimage};" \
53   - "load mmc 0:1 ${fdt_addr} ${fdtimage}\0" \
54   - "qspiload=sf probe && mtdparts default && run ubiload\0" \
55   - "qspiboot=setenv bootargs " CONFIG_BOOTARGS \
56   - " ubi.mtd=1,64 root=ubi0:rootfs rw rootfstype=ubifs;"\
57   - "bootz ${loadaddr} - ${fdt_addr}\0" \
58   - "ubiload=ubi part UBI && ubifsmount ubi0 && " \
59   - "ubifsload ${loadaddr} /boot/${bootimage} && " \
60   - "ubifsload ${fdt_addr} /boot/${fdtimage}\0"
61 29  
62 30 /* The rest of the configuration is shared */
63 31 #include <configs/socfpga_common.h>