Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 7966b43778f2556ecbda2275f1296934071224b2

Authored by Stefan Agner
Committed by Stefano Babic
1 parent f3a8546b8f
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: vf610: move to standard arch/board approach 

Move Freescale/NXP Vybrid to a standard arch/board approach, similar
to what has been done to i.MX 6 earlier in commit 89ebc82137be ("ARM:
mx6: move to a standard arch/board approach").

Signed-off-by: Stefan Agner <stefan.agner@toradex.com>

Showing 13 changed files with 45 additions and 45 deletions Side-by-side Diff

... ... @@ -786,31 +786,11 @@
786 786 select CPU_V7
787 787 select SYS_FSL_ERRATUM_ESDHC_A001
788 788  
789   -config TARGET_VF610TWR
790   - bool "Support vf610twr"
  789 +config ARCH_VF610
  790 + bool "Freescale Vybrid"
791 791 select CPU_V7
792 792 select SYS_FSL_ERRATUM_ESDHC111
793 793  
794   -config TARGET_COLIBRI_VF
795   - bool "Support Colibri VF50/61"
796   - select BOARD_LATE_INIT
797   - select CPU_V7
798   - select SYS_FSL_ERRATUM_ESDHC111
799   -
800   -config TARGET_PCM052
801   - bool "Support pcm-052"
802   - select CPU_V7
803   - select SYS_FSL_ERRATUM_ESDHC111
804   - select SYS_FSL_ERRATUM_ESDHC135
805   - select SYS_FSL_ERRATUM_ESDHC_A001
806   -
807   -config TARGET_BK4R1
808   - bool "Support BK4r1"
809   - select CPU_V7
810   - select SYS_FSL_ERRATUM_ESDHC111
811   - select SYS_FSL_ERRATUM_ESDHC135
812   - select SYS_FSL_ERRATUM_ESDHC_A001
813   -
814 794 config ARCH_ZYNQ
815 795 bool "Xilinx Zynq Platform"
816 796 select BOARD_LATE_INIT
... ... @@ -1197,6 +1177,8 @@
1197 1177  
1198 1178 source "arch/arm/mach-uniphier/Kconfig"
1199 1179  
  1180 +source "arch/arm/cpu/armv7/vf610/Kconfig"
  1181 +
1200 1182 source "arch/arm/mach-zynq/Kconfig"
1201 1183  
1202 1184 source "arch/arm/cpu/armv7/Kconfig"
... ... @@ -1253,7 +1235,6 @@
1253 1235 source "board/freescale/mx53loco/Kconfig"
1254 1236 source "board/freescale/mx53smd/Kconfig"
1255 1237 source "board/freescale/s32v234evb/Kconfig"
1256   -source "board/freescale/vf610twr/Kconfig"
1257 1238 source "board/grinn/chiliboard/Kconfig"
1258 1239 source "board/gumstix/pepper/Kconfig"
1259 1240 source "board/h2200/Kconfig"
... ... @@ -1262,7 +1243,6 @@
1262 1243 source "board/isee/igep0033/Kconfig"
1263 1244 source "board/olimex/mx23_olinuxino/Kconfig"
1264 1245 source "board/phytec/pcm051/Kconfig"
1265   -source "board/phytec/pcm052/Kconfig"
1266 1246 source "board/ppcag/bg0900/Kconfig"
1267 1247 source "board/sandisk/sansa_fuze_plus/Kconfig"
1268 1248 source "board/schulercontrol/sc_sps_1/Kconfig"
... ... @@ -1286,7 +1266,6 @@
1286 1266 source "board/ti/ti816x/Kconfig"
1287 1267 source "board/timll/devkit3250/Kconfig"
1288 1268 source "board/toradex/colibri_pxa270/Kconfig"
1289   -source "board/toradex/colibri_vf/Kconfig"
1290 1269 source "board/technologic/ts4600/Kconfig"
1291 1270 source "board/technologic/ts4800/Kconfig"
1292 1271 source "board/vscom/baltos/Kconfig"
arch/arm/cpu/armv7/vf610/Kconfig
Diff comments   View file @ 7966b43
  1 +if ARCH_VF610
  2 +
  3 +config VF610
  4 + bool
  5 + default y
  6 +
  7 +choice
  8 + prompt "Vybrid board select"
  9 +
  10 +config TARGET_VF610TWR
  11 + bool "TWR-VF65GS10-DS5"
  12 +
  13 +config TARGET_COLIBRI_VF
  14 + bool "Colibri VF50/61"
  15 + select BOARD_LATE_INIT
  16 +
  17 +config TARGET_PCM052
  18 + bool "PCM-052"
  19 + select SYS_FSL_ERRATUM_ESDHC135
  20 + select SYS_FSL_ERRATUM_ESDHC_A001
  21 +
  22 +config TARGET_BK4R1
  23 + bool "BK4r1"
  24 + select SYS_FSL_ERRATUM_ESDHC135
  25 + select SYS_FSL_ERRATUM_ESDHC_A001
  26 +
  27 +endchoice
  28 +
  29 +config SYS_SOC
  30 + default "vf610"
  31 +
  32 +source "board/freescale/vf610twr/Kconfig"
  33 +source "board/phytec/pcm052/Kconfig"
  34 +source "board/toradex/colibri_vf/Kconfig"
  35 +
  36 +endif
board/freescale/vf610twr/Kconfig
Diff comments   View file @ 7966b43
... ... @@ -6,9 +6,6 @@
6 6 config SYS_VENDOR
7 7 default "freescale"
8 8  
9   -config SYS_SOC
10   - default "vf610"
11   -
12 9 config SYS_CONFIG_NAME
13 10 default "vf610twr"
14 11  
board/phytec/pcm052/Kconfig
Diff comments   View file @ 7966b43
... ... @@ -6,9 +6,6 @@
6 6 config SYS_VENDOR
7 7 default "phytec"
8 8  
9   -config SYS_SOC
10   - default "vf610"
11   -
12 9 config SYS_CONFIG_NAME
13 10 default "pcm052"
14 11  
... ... @@ -25,9 +22,6 @@
25 22  
26 23 config SYS_VENDOR
27 24 default "phytec"
28   -
29   -config SYS_SOC
30   - default "vf610"
31 25  
32 26 config SYS_CONFIG_NAME
33 27 default "bk4r1"
board/toradex/colibri_vf/Kconfig
Diff comments   View file @ 7966b43
1 1 if TARGET_COLIBRI_VF
2 2  
3   -config SYS_CPU
4   - default "armv7"
5   -
6 3 config SYS_BOARD
7 4 default "colibri_vf"
8 5  
9 6 config SYS_VENDOR
10 7 default "toradex"
11   -
12   -config SYS_SOC
13   - default "vf610"
14 8  
15 9 config SYS_CONFIG_NAME
16 10 default "colibri_vf"
configs/bk4r1_defconfig
Diff comments   View file @ 7966b43
1 1 CONFIG_ARM=y
  2 +CONFIG_ARCH_VF610=y
2 3 CONFIG_TARGET_BK4R1=y
3 4 CONFIG_DEFAULT_DEVICE_TREE="bk4r1"
4 5 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/phytec/pcm052/imximage.cfg,ENV_IS_IN_NAND"
configs/colibri_vf_defconfig
Diff comments   View file @ 7966b43
1 1 CONFIG_ARM=y
  2 +CONFIG_ARCH_VF610=y
2 3 CONFIG_TARGET_COLIBRI_VF=y
3 4 CONFIG_DEFAULT_DEVICE_TREE="vf610-colibri"
4 5 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri_vf/imximage.cfg,ENV_IS_IN_NAND,IMX_NAND"
configs/pcm052_defconfig
Diff comments   View file @ 7966b43
1 1 CONFIG_ARM=y
  2 +CONFIG_ARCH_VF610=y
2 3 CONFIG_TARGET_PCM052=y
3 4 CONFIG_DEFAULT_DEVICE_TREE="pcm052"
4 5 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/phytec/pcm052/imximage.cfg,ENV_IS_IN_NAND"
configs/vf610twr_defconfig
Diff comments   View file @ 7966b43
1 1 CONFIG_ARM=y
  2 +CONFIG_ARCH_VF610=y
2 3 CONFIG_TARGET_VF610TWR=y
3 4 CONFIG_DEFAULT_DEVICE_TREE="vf610-twr"
4 5 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/vf610twr/imximage.cfg,ENV_IS_IN_MMC"
configs/vf610twr_nand_defconfig
Diff comments   View file @ 7966b43
1 1 CONFIG_ARM=y
  2 +CONFIG_ARCH_VF610=y
2 3 CONFIG_TARGET_VF610TWR=y
3 4 CONFIG_DEFAULT_DEVICE_TREE="vf610-twr"
4 5 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/vf610twr/imximage.cfg,ENV_IS_IN_NAND"
include/configs/colibri_vf.h
Diff comments   View file @ 7966b43
... ... @@ -14,7 +14,6 @@
14 14  
15 15 #include <asm/arch/imx-regs.h>
16 16  
17   -#define CONFIG_VF610
18 17 #define CONFIG_SYS_THUMB_BUILD
19 18 #define CONFIG_SYS_FSL_CLK
20 19  
include/configs/pcm052.h
Diff comments   View file @ 7966b43
... ... @@ -11,8 +11,6 @@
11 11  
12 12 #include <asm/arch/imx-regs.h>
13 13  
14   -#define CONFIG_VF610
15   -
16 14 #define CONFIG_SYS_THUMB_BUILD
17 15  
18 16 #define CONFIG_SKIP_LOWLEVEL_INIT
include/configs/vf610twr.h
Diff comments   View file @ 7966b43
... ... @@ -11,8 +11,6 @@
11 11  
12 12 #include <asm/arch/imx-regs.h>
13 13  
14   -#define CONFIG_VF610
15   -
16 14 #define CONFIG_SYS_FSL_CLK
17 15  
18 16 #define CONFIG_MACH_TYPE 4146