Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit ec4ac4e7c07fb76f8d0ae5e0f1670f6f879618a6

Authored by Simon Glass
1 parent e1efec4e0a
Exists in v2017.01-smarct4x and in 30 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_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.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, smarc_8mq_lf_v2020.04, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc

rockchip: Correct the defconfig order 

This has got out of sequence somehow. Fix it.

Signed-off-by: Simon Glass <sjg@chromium.org>

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

configs/chromebook_jerry_defconfig
Diff comments   View file @ ec4ac4e
... ... @@ -4,9 +4,9 @@
4 4 CONFIG_ROCKCHIP_RK3288=y
5 5 CONFIG_TARGET_CHROMEBOOK_JERRY=y
6 6 CONFIG_SPL_STACK_R_ADDR=0x80000
7   -CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000
8 7 CONFIG_DEFAULT_DEVICE_TREE="rk3288-jerry"
9 8 CONFIG_SPL_STACK_R=y
  9 +CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000
10 10 # CONFIG_CMD_IMLS is not set
11 11 # CONFIG_CMD_SETEXPR is not set
12 12 CONFIG_CMD_PMIC=y
13 13  
... ... @@ -15,11 +15,11 @@
15 15 CONFIG_REGMAP=y
16 16 CONFIG_SPL_REGMAP=y
17 17 CONFIG_SYSCON=y
  18 +CONFIG_SPL_SYSCON=y
18 19 CONFIG_CLK=y
19 20 CONFIG_SPL_CLK=y
20 21 CONFIG_ROCKCHIP_GPIO=y
21 22 CONFIG_SYS_I2C_ROCKCHIP=y
22   -CONFIG_SPL_SYSCON=y
23 23 CONFIG_LED=y
24 24 CONFIG_SPL_LED=y
25 25 CONFIG_LED_GPIO=y
26 26  
... ... @@ -42,9 +42,9 @@
42 42 CONFIG_DEBUG_UART_CLOCK=24000000
43 43 CONFIG_DEBUG_UART_SHIFT=2
44 44 CONFIG_SYS_NS16550=y
  45 +CONFIG_ROCKCHIP_SPI=y
45 46 CONFIG_USE_PRIVATE_LIBGCC=y
46 47 CONFIG_USE_TINY_PRINTF=y
47 48 CONFIG_CMD_DHRYSTONE=y
48 49 CONFIG_ERRNO_STR=y
49   -CONFIG_ROCKCHIP_SPI=y
configs/firefly-rk3288_defconfig
Diff comments   View file @ ec4ac4e
... ... @@ -4,9 +4,9 @@
4 4 CONFIG_ROCKCHIP_RK3288=y
5 5 CONFIG_TARGET_FIREFLY_RK3288=y
6 6 CONFIG_SPL_STACK_R_ADDR=0x80000
7   -CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000
8 7 CONFIG_DEFAULT_DEVICE_TREE="rk3288-firefly"
9 8 CONFIG_SPL_STACK_R=y
  9 +CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000
10 10 # CONFIG_CMD_IMLS is not set
11 11 # CONFIG_CMD_SETEXPR is not set
12 12 CONFIG_CMD_PMIC=y
13 13  
... ... @@ -15,11 +15,11 @@
15 15 CONFIG_REGMAP=y
16 16 CONFIG_SPL_REGMAP=y
17 17 CONFIG_SYSCON=y
  18 +CONFIG_SPL_SYSCON=y
18 19 CONFIG_CLK=y
19 20 CONFIG_SPL_CLK=y
20 21 CONFIG_ROCKCHIP_GPIO=y
21 22 CONFIG_SYS_I2C_ROCKCHIP=y
22   -CONFIG_SPL_SYSCON=y
23 23 CONFIG_LED=y
24 24 CONFIG_LED_GPIO=y
25 25 CONFIG_RESET=y