Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 29c06551737449c94bcc142e01f753d94893c83d

Authored by Dalon Westergreen
Committed by Marek Vasut
1 parent 451e824125
Exists in smarc_8mq_lf_v2020.04 and in 18 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, emb_lf_v2023.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: DE0 use environment in common header 

This removes the default environment from the de0 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

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 20 deletions Side-by-side Diff

configs/socfpga_de0_nano_soc_defconfig
Diff comments   View file @ 29c0655
... ... @@ -4,6 +4,7 @@
4 4 CONFIG_TARGET_SOCFPGA_TERASIC_DE0_NANO=y
5 5 CONFIG_SPL_STACK_R_ADDR=0x00800000
6 6 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_de0_nano_soc"
  7 +CONFIG_DEFAULT_FDT_FILE="socfpga_cyclone5_de0_nano_soc.dtb"
7 8 CONFIG_FIT=y
8 9 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
9 10 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
... ... @@ -58,4 +59,6 @@
58 59 CONFIG_G_DNL_VENDOR_NUM=0x0525
59 60 CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
60 61 CONFIG_USE_TINY_PRINTF=y
  62 +CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION_TYPE=y
  63 +CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION_TYPE=0xa2
include/configs/socfpga_de0_nano_soc.h
Diff comments   View file @ 29c0655
... ... @@ -16,9 +16,6 @@
16 16 #define PHYS_SDRAM_1_SIZE 0x40000000 /* 1GiB */
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,23 +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   - "loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
36   - "ramboot=setenv bootargs " CONFIG_BOOTARGS ";" \
37   - "bootm ${loadaddr} - ${fdt_addr}\0" \
38   - "bootimage=zImage\0" \
39   - "fdt_addr=100\0" \
40   - "fdtimage=socfpga.dtb\0" \
41   - "bootm ${loadaddr} - ${fdt_addr}\0" \
42   - "mmcroot=/dev/mmcblk0p2\0" \
43   - "mmcboot=setenv bootargs " CONFIG_BOOTARGS \
44   - " root=${mmcroot} rw rootwait;" \
45   - "bootz ${loadaddr} - ${fdt_addr}\0" \
46   - "mmcload=mmc rescan;" \
47   - "load mmc 0:1 ${loadaddr} ${bootimage};" \
48   - "load mmc 0:1 ${fdt_addr} ${fdtimage}\0" \
49 29  
50 30 /* The rest of the configuration is shared */
51 31 #include <configs/socfpga_common.h>