Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit b52acd8f9793bd23d5c3a1844c5f311ad6fad82e

Authored by Dalon Westergreen
Committed by Marek Vasut
1 parent 9e41d225ca
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: SoCKit use environment in common header 

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

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 1 additions and 28 deletions Side-by-side Diff

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