Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 5fd3f4346e7d3b11c593c13cbccec7095513c380

Authored by Masahiro Yamada
1 parent 752b75d64b
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

ARM: uniphier: merge ph1_ld4_defconfig and ph1_sld8_defconfig 

These two are similar enough to be merged into a single
defconfig file.  Distinguish one from another by "DEVICE_TREE"
from the command line.  The how-to-build in doc/README.uniphier
should be also updated.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

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

... ... @@ -162,6 +162,7 @@
162 162 T: git git://git.denx.de/u-boot-uniphier.git
163 163 F: arch/arm/mach-uniphier/
164 164 F: configs/ph1_*_defconfig
  165 +F: configs/uniphier_*_defconfig
165 166 N: uniphier
166 167  
167 168 ARM ZYNQ
configs/ph1_ld4_defconfig
View file @ 5fd3f43
1   -CONFIG_ARM=y
2   -CONFIG_ARCH_UNIPHIER=y
3   -CONFIG_SYS_MALLOC_F_LEN=0x2000
4   -CONFIG_ARCH_UNIPHIER_PH1_LD4=y
5   -CONFIG_MICRO_SUPPORT_CARD=y
6   -CONFIG_SYS_TEXT_BASE=0x84000000
7   -CONFIG_DEFAULT_DEVICE_TREE="uniphier-ph1-ld4-ref"
8   -CONFIG_HUSH_PARSER=y
9   -# CONFIG_CMD_XIMG is not set
10   -# CONFIG_CMD_ENV_EXISTS is not set
11   -CONFIG_CMD_NAND=y
12   -CONFIG_CMD_I2C=y
13   -CONFIG_CMD_USB=y
14   -# CONFIG_CMD_FPGA is not set
15   -CONFIG_CMD_TFTPPUT=y
16   -CONFIG_CMD_PING=y
17   -CONFIG_CMD_TIME=y
18   -# CONFIG_CMD_MISC is not set
19   -CONFIG_NET_RANDOM_ETHADDR=y
20   -CONFIG_SPL_SIMPLE_BUS=y
21   -CONFIG_NAND_DENALI=y
22   -CONFIG_SYS_NAND_DENALI_64BIT=y
23   -CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES=8
24   -CONFIG_SPL_NAND_DENALI=y
25   -CONFIG_PINCTRL=y
26   -CONFIG_SPL_PINCTRL=y
27   -CONFIG_UNIPHIER_SERIAL=y
28   -CONFIG_USB=y
29   -CONFIG_USB_EHCI_HCD=y
30   -CONFIG_USB_STORAGE=y
configs/ph1_sld8_defconfig
View file @ 5fd3f43
1   -CONFIG_ARM=y
2   -CONFIG_ARCH_UNIPHIER=y
3   -CONFIG_SYS_MALLOC_F_LEN=0x2000
4   -CONFIG_ARCH_UNIPHIER_PH1_SLD8=y
5   -CONFIG_MICRO_SUPPORT_CARD=y
6   -CONFIG_SYS_TEXT_BASE=0x84000000
7   -CONFIG_DEFAULT_DEVICE_TREE="uniphier-ph1-sld8-ref"
8   -CONFIG_HUSH_PARSER=y
9   -# CONFIG_CMD_XIMG is not set
10   -# CONFIG_CMD_ENV_EXISTS is not set
11   -CONFIG_CMD_NAND=y
12   -CONFIG_CMD_I2C=y
13   -CONFIG_CMD_USB=y
14   -# CONFIG_CMD_FPGA is not set
15   -CONFIG_CMD_TFTPPUT=y
16   -CONFIG_CMD_PING=y
17   -CONFIG_CMD_TIME=y
18   -# CONFIG_CMD_MISC is not set
19   -CONFIG_NET_RANDOM_ETHADDR=y
20   -CONFIG_SPL_SIMPLE_BUS=y
21   -CONFIG_NAND_DENALI=y
22   -CONFIG_SYS_NAND_DENALI_64BIT=y
23   -CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES=8
24   -CONFIG_SPL_NAND_DENALI=y
25   -CONFIG_PINCTRL=y
26   -CONFIG_SPL_PINCTRL=y
27   -CONFIG_UNIPHIER_SERIAL=y
28   -CONFIG_USB=y
29   -CONFIG_USB_EHCI_HCD=y
30   -CONFIG_USB_STORAGE=y
configs/uniphier_ld4_sld8_defconfig
Diff comments   View file @ 5fd3f43
  1 +CONFIG_ARM=y
  2 +CONFIG_ARCH_UNIPHIER=y
  3 +CONFIG_SYS_MALLOC_F_LEN=0x2000
  4 +CONFIG_ARCH_UNIPHIER_PH1_LD4=y
  5 +CONFIG_ARCH_UNIPHIER_PH1_SLD8=y
  6 +CONFIG_MICRO_SUPPORT_CARD=y
  7 +CONFIG_SYS_TEXT_BASE=0x84000000
  8 +CONFIG_DEFAULT_DEVICE_TREE="uniphier-ph1-ld4-ref"
  9 +CONFIG_HUSH_PARSER=y
  10 +# CONFIG_CMD_XIMG is not set
  11 +# CONFIG_CMD_ENV_EXISTS is not set
  12 +CONFIG_CMD_NAND=y
  13 +CONFIG_CMD_I2C=y
  14 +CONFIG_CMD_USB=y
  15 +# CONFIG_CMD_FPGA is not set
  16 +CONFIG_CMD_TFTPPUT=y
  17 +CONFIG_CMD_PING=y
  18 +CONFIG_CMD_TIME=y
  19 +# CONFIG_CMD_MISC is not set
  20 +CONFIG_NET_RANDOM_ETHADDR=y
  21 +CONFIG_SPL_SIMPLE_BUS=y
  22 +CONFIG_NAND_DENALI=y
  23 +CONFIG_SYS_NAND_DENALI_64BIT=y
  24 +CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES=8
  25 +CONFIG_SPL_NAND_DENALI=y
  26 +CONFIG_PINCTRL=y
  27 +CONFIG_SPL_PINCTRL=y
  28 +CONFIG_UNIPHIER_SERIAL=y
  29 +CONFIG_USB=y
  30 +CONFIG_USB_EHCI_HCD=y
  31 +CONFIG_USB_STORAGE=y
... ... @@ -32,16 +32,16 @@
32 32 $ make ph1_sld3_defconfig
33 33 $ make CROSS_COMPILE=arm-linux-gnueabi-
34 34  
35   -PH1-LD4:
36   - $ make ph1_ld4_defconfig
  35 +PH1-LD4 reference board:
  36 + $ make uniphier_ld4_sld8_defconfig
37 37 $ make CROSS_COMPILE=arm-linux-gnueabi-
38 38  
  39 +PH1-sLD8 reference board:
  40 + $ make uniphier_ld4_sld8_defconfig
  41 + $ make CROSS_COMPILE=arm-linux-gnueabi- DEVICE_TREE=uniphier-ph1-sld8-ref
  42 +
39 43 PH1-Pro4:
40 44 $ make ph1_pro4_defconfig
41   - $ make CROSS_COMPILE=arm-linux-gnueabi-
42   -
43   -PH1-sLD8:
44   - $ make ph1_sld8_defconfig
45 45 $ make CROSS_COMPILE=arm-linux-gnueabi-
46 46  
47 47 PH1-Pro5: