Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 70b5ea74063e55bef59190833b5d83039e3d3ae8

Authored by Alexey Brodkin
1 parent 31e00acdc7
Exists in smarc_8mq_lf_v2020.04 and in 11 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_8m-imx_v2019.04_4.19.35_1.1.0, 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

ARC: Move ENV_SIZE and ENV_OFFSET to Kconfig 

Join the party of some ARM boards and drop more
items from include/configs/xxx.h.

Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
Cc: Michal Simek <michal.simek@xilinx.com>
Cc: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>

Showing 10 changed files with 6 additions and 18 deletions Side-by-side Diff

configs/emsdp_defconfig
Diff comments   View file @ 70b5ea7
... ... @@ -3,6 +3,7 @@
3 3 CONFIG_CPU_ARCEM6=y
4 4 CONFIG_TARGET_EMSDP=y
5 5 CONFIG_SYS_TEXT_BASE=0x00000000
  6 +CONFIG_ENV_SIZE=0x1000
6 7 CONFIG_SYS_CLK_FREQ=40000000
7 8 # CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
8 9 CONFIG_VERSION_VARIABLE=y
configs/iot_devkit_defconfig
Diff comments   View file @ 70b5ea7
... ... @@ -5,6 +5,7 @@
5 5 CONFIG_SYS_DCACHE_OFF=y
6 6 CONFIG_TARGET_IOT_DEVKIT=y
7 7 CONFIG_SYS_TEXT_BASE=0x00000000
  8 +CONFIG_ENV_SIZE=0x1000
8 9 CONFIG_SYS_CLK_FREQ=16000000
9 10 CONFIG_LOCALVERSION="-iotdk-1.0"
10 11 # CONFIG_ARCH_FIXUP_FDT_MEMORY is not set
configs/tb100_defconfig
Diff comments   View file @ 70b5ea7
1 1 CONFIG_ARC=y
2 2 CONFIG_TARGET_TB100=y
3 3 CONFIG_SYS_TEXT_BASE=0x84000000
  4 +CONFIG_ENV_SIZE=0x800
4 5 CONFIG_SYS_CLK_FREQ=500000000
5 6 CONFIG_BOOTDELAY=3
6 7 CONFIG_USE_BOOTARGS=y
... ... @@ -431,7 +431,7 @@
431 431 It's a string of the EXT4 file name. This file use to store the
432 432 environment (explicit path to the file)
433 433  
434   -if ARCH_ROCKCHIP || ARCH_SUNXI || ARCH_ZYNQ || ARCH_ZYNQMP || ARCH_VERSAL
  434 +if ARCH_ROCKCHIP || ARCH_SUNXI || ARCH_ZYNQ || ARCH_ZYNQMP || ARCH_VERSAL || ARC
435 435  
436 436 config ENV_OFFSET
437 437 hex "Environment Offset"
... ... @@ -441,6 +441,7 @@
441 441 default 0x88000 if ARCH_SUNXI
442 442 default 0xE0000 if ARCH_ZYNQ
443 443 default 0x1E00000 if ARCH_ZYNQMP
  444 + default 0 if ARC
444 445 help
445 446 Offset from the start of the device (or partition)
446 447  
... ... @@ -449,6 +450,7 @@
449 450 default 0x40000 if ENV_IS_IN_SPI_FLASH && ARCH_ZYNQMP
450 451 default 0x20000 if ARCH_SUNXI || ARCH_ZYNQ
451 452 default 0x8000 if ARCH_ROCKCHIP || ARCH_ZYNQMP || ARCH_VERSAL
  453 + default 0x4000 if ARC
452 454 help
453 455 Size of the environment storage area
454 456  
include/configs/axs10x.h
Diff comments   View file @ 70b5ea7
... ... @@ -62,7 +62,6 @@
62 62 /*
63 63 * Environment settings
64 64 */
65   -#define CONFIG_ENV_SIZE SZ_16K
66 65 #define CONFIG_EXTRA_ENV_SETTINGS \
67 66 "upgrade=if mmc rescan && " \
68 67 "fatload mmc 0:1 ${loadaddr} u-boot-update.img && " \
include/configs/emsdp.h
Diff comments   View file @ 70b5ea7
... ... @@ -21,7 +21,6 @@
21 21 /*
22 22 * Environment
23 23 */
24   -#define CONFIG_ENV_SIZE SZ_4K
25 24 #define CONFIG_BOOTFILE "app.bin"
26 25 #define CONFIG_LOADADDR CONFIG_SYS_LOAD_ADDR
27 26  
include/configs/hsdk.h
Diff comments   View file @ 70b5ea7
... ... @@ -57,8 +57,6 @@
57 57 /*
58 58 * Environment settings
59 59 */
60   -#define CONFIG_ENV_SIZE SZ_16K
61   -
62 60 #define CONFIG_EXTRA_ENV_SETTINGS \
63 61 "upgrade=if mmc rescan && " \
64 62 "fatload mmc 0:1 ${loadaddr} u-boot-update.scr && " \
include/configs/iot_devkit.h
Diff comments   View file @ 70b5ea7
... ... @@ -74,7 +74,6 @@
74 74 /*
75 75 * Environment
76 76 */
77   -#define CONFIG_ENV_SIZE SZ_4K
78 77 #define CONFIG_BOOTFILE "app.bin"
79 78 #define CONFIG_LOADADDR CONFIG_SYS_LOAD_ADDR
80 79  
include/configs/nsim.h
Diff comments   View file @ 70b5ea7
... ... @@ -25,12 +25,6 @@
25 25 #define CONFIG_SYS_LOAD_ADDR 0x82000000
26 26  
27 27 /*
28   - * Environment settings
29   - */
30   -#define CONFIG_ENV_SIZE SZ_512
31   -#define CONFIG_ENV_OFFSET 0
32   -
33   -/*
34 28 * Environment configuration
35 29 */
36 30 #define CONFIG_BOOTFILE "uImage"
include/configs/tb100.h
Diff comments   View file @ 70b5ea7
... ... @@ -53,12 +53,6 @@
53 53 */
54 54  
55 55 /*
56   - * Environment settings
57   - */
58   -#define CONFIG_ENV_SIZE SZ_2K
59   -#define CONFIG_ENV_OFFSET 0
60   -
61   -/*
62 56 * Environment configuration
63 57 */
64 58 #define CONFIG_BOOTFILE "uImage"