diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 13087e1a83a6b7fac75682ba54e3dcdce8378fd6..24614e3ead39c5c0f2fa2133a009ed5a111f8727 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -131,53 +131,10 @@ config TARGET_TAURUS
 config TARGET_STAMP9G20
 	bool "Support stamp9g20"
 
-config TARGET_CAM_ENC_4XX
-	bool "Support cam_enc_4xx"
-
-config TARGET_IPAM390
-	bool "Support ipam390"
-
-config TARGET_DA830EVM
-	bool "Support da830evm"
-
-config TARGET_DA850EVM
-	bool "Support da850evm"
-
-config TARGET_HAWKBOARD
-	bool "Support hawkboard"
-
-config TARGET_DAVINCI_DM355EVM
-	bool "Support davinci_dm355evm"
-
-config TARGET_DAVINCI_DM355LEOPARD
-	bool "Support davinci_dm355leopard"
-
-config TARGET_DAVINCI_DM365EVM
-	bool "Support davinci_dm365evm"
-
-config TARGET_DAVINCI_DM6467EVM
-	bool "Support davinci_dm6467evm"
-
-config TARGET_DAVINCI_DVEVM
-	bool "Support davinci_dvevm"
-
-config TARGET_EA20
-	bool "Support ea20"
-
-config TARGET_DAVINCI_SCHMOOGIE
-	bool "Support davinci_schmoogie"
-
-config TARGET_DAVINCI_SFFSDR
-	bool "Support davinci_sffsdr"
-
-config TARGET_DAVINCI_SONATA
-	bool "Support davinci_sonata"
-
-config TARGET_ENBW_CMC
-	bool "Support enbw_cmc"
-
-config TARGET_CALIMAIN
-	bool "Support calimain"
+config ARCH_DAVINCI
+	bool "TI DaVinci"
+	help
+	  Support for TI's DaVinci platform.
 
 config KIRKWOOD
 	bool "Marvell Kirkwood"
@@ -632,6 +589,8 @@ config TARGET_JORNADA
 
 endchoice
 
+source "arch/arm/cpu/arm926ejs/davinci/Kconfig"
+
 source "arch/arm/cpu/armv7/exynos/Kconfig"
 
 source "arch/arm/cpu/arm926ejs/kirkwood/Kconfig"
@@ -646,7 +605,6 @@ source "arch/arm/cpu/armv7/zynq/Kconfig"
 
 source "board/8dtech/eco5pk/Kconfig"
 source "board/aristainetos/Kconfig"
-source "board/Barix/ipam390/Kconfig"
 source "board/BuR/kwb/Kconfig"
 source "board/BuR/tseries/Kconfig"
 source "board/BuS/eb_cpux9k2/Kconfig"
@@ -657,7 +615,6 @@ source "board/Marvell/aspenite/Kconfig"
 source "board/Marvell/dkb/Kconfig"
 source "board/Marvell/gplugd/Kconfig"
 source "board/afeb9260/Kconfig"
-source "board/ait/cam_enc_4xx/Kconfig"
 source "board/altera/socfpga/Kconfig"
 source "board/armadeus/apf27/Kconfig"
 source "board/armltd/integrator/Kconfig"
@@ -695,22 +652,11 @@ source "board/congatec/cgtqmx6eval/Kconfig"
 source "board/corscience/tricorder/Kconfig"
 source "board/creative/xfi3/Kconfig"
 source "board/davedenx/qong/Kconfig"
-source "board/davinci/da8xxevm/Kconfig"
-source "board/davinci/dm355evm/Kconfig"
-source "board/davinci/dm355leopard/Kconfig"
-source "board/davinci/dm365evm/Kconfig"
-source "board/davinci/dm6467evm/Kconfig"
-source "board/davinci/dvevm/Kconfig"
-source "board/davinci/ea20/Kconfig"
-source "board/davinci/schmoogie/Kconfig"
-source "board/davinci/sffsdr/Kconfig"
-source "board/davinci/sonata/Kconfig"
 source "board/denx/m28evk/Kconfig"
 source "board/denx/m53evk/Kconfig"
 source "board/egnite/ethernut5/Kconfig"
 source "board/embest/mx6boards/Kconfig"
 source "board/emk/top9000/Kconfig"
-source "board/enbw/enbw_cmc/Kconfig"
 source "board/esd/meesc/Kconfig"
 source "board/esd/otc570/Kconfig"
 source "board/esg/ima3-mx53/Kconfig"
@@ -758,7 +704,6 @@ source "board/matrix_vision/mvblx/Kconfig"
 source "board/mpl/vcma9/Kconfig"
 source "board/nokia/rx51/Kconfig"
 source "board/olimex/mx23_olinuxino/Kconfig"
-source "board/omicron/calimain/Kconfig"
 source "board/overo/Kconfig"
 source "board/palmld/Kconfig"
 source "board/palmtc/Kconfig"
diff --git a/arch/arm/cpu/arm926ejs/davinci/Kconfig b/arch/arm/cpu/arm926ejs/davinci/Kconfig
new file mode 100644
index 0000000000000000000000000000000000000000..be1b0f9126cfaa8911224dfcda33499f66323670
--- /dev/null
+++ b/arch/arm/cpu/arm926ejs/davinci/Kconfig
@@ -0,0 +1,79 @@
+if ARCH_DAVINCI
+
+choice
+	prompt "DaVinci board select"
+
+config TARGET_ENBW_CMC
+	bool "EnBW CMC board"
+
+config TARGET_IPAM390
+	bool "IPAM390 board"
+
+config TARGET_DA830EVM
+	bool "DA830 EVM board"
+
+config TARGET_DA850EVM
+	bool "DA850 EVM board"
+
+config TARGET_CAM_ENC_4XX
+	bool "CAM ENC 4xx board"
+
+config TARGET_HAWKBOARD
+	bool "Hawkboard"
+
+config TARGET_DAVINCI_DM355EVM
+	bool "DM355 EVM board"
+
+config TARGET_DAVINCI_DM355LEOPARD
+	bool "DM355 Leopard board"
+
+config TARGET_DAVINCI_DM365EVM
+	bool "DM365 EVM board"
+
+config TARGET_DAVINCI_DM6467EVM
+	bool "DM6467 EVM board"
+
+config TARGET_DAVINCI_DVEVM
+	bool "DVEVM board"
+
+config TARGET_EA20
+	bool "EA20 board"
+
+config TARGET_DAVINCI_SCHMOOGIE
+	bool "Schmoogie board"
+
+config TARGET_DAVINCI_SFFSDR
+	bool "SFFSDR board"
+
+config TARGET_DAVINCI_SONATA
+	bool "Sonata board"
+
+config TARGET_CALIMAIN
+	bool "Calimain board"
+
+endchoice
+
+config SYS_CPU
+	string
+	default "arm926ejs"
+
+config SYS_SOC
+	string
+	default "davinci"
+
+source "board/enbw/enbw_cmc/Kconfig"
+source "board/ait/cam_enc_4xx/Kconfig"
+source "board/Barix/ipam390/Kconfig"
+source "board/davinci/da8xxevm/Kconfig"
+source "board/davinci/dm355evm/Kconfig"
+source "board/davinci/dm355leopard/Kconfig"
+source "board/davinci/dm365evm/Kconfig"
+source "board/davinci/dm6467evm/Kconfig"
+source "board/davinci/dvevm/Kconfig"
+source "board/davinci/ea20/Kconfig"
+source "board/davinci/schmoogie/Kconfig"
+source "board/davinci/sffsdr/Kconfig"
+source "board/davinci/sonata/Kconfig"
+source "board/omicron/calimain/Kconfig"
+
+endif
diff --git a/board/Barix/ipam390/Kconfig b/board/Barix/ipam390/Kconfig
index a8134479eff42e807d64ee023b26af3935d1a60c..588ee73791a0b6d1eb5ffcf0b5604b82ef4d7744 100644
--- a/board/Barix/ipam390/Kconfig
+++ b/board/Barix/ipam390/Kconfig
@@ -1,9 +1,5 @@
 if TARGET_IPAM390
 
-config SYS_CPU
-	string
-	default "arm926ejs"
-
 config SYS_BOARD
 	string
 	default "ipam390"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "Barix"
 
-config SYS_SOC
-	string
-	default "davinci"
-
 config SYS_CONFIG_NAME
 	string
 	default "ipam390"
diff --git a/board/ait/cam_enc_4xx/Kconfig b/board/ait/cam_enc_4xx/Kconfig
index d1f89df54a729b020e2780b804d048789fb19444..2b886929b5a9e7910ccf6125dac0ee65fd0444b0 100644
--- a/board/ait/cam_enc_4xx/Kconfig
+++ b/board/ait/cam_enc_4xx/Kconfig
@@ -1,9 +1,5 @@
 if TARGET_CAM_ENC_4XX
 
-config SYS_CPU
-	string
-	default "arm926ejs"
-
 config SYS_BOARD
 	string
 	default "cam_enc_4xx"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "ait"
 
-config SYS_SOC
-	string
-	default "davinci"
-
 config SYS_CONFIG_NAME
 	string
 	default "cam_enc_4xx"
diff --git a/board/davinci/da8xxevm/Kconfig b/board/davinci/da8xxevm/Kconfig
index 89f78d7388094472c96cb4673f4d1a7a2efe1cc3..b1237030aaf562ce67ab0c3a4f489805fad7e147 100644
--- a/board/davinci/da8xxevm/Kconfig
+++ b/board/davinci/da8xxevm/Kconfig
@@ -1,9 +1,5 @@
 if TARGET_DA830EVM
 
-config SYS_CPU
-	string
-	default "arm926ejs"
-
 config SYS_BOARD
 	string
 	default "da8xxevm"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "davinci"
 
-config SYS_SOC
-	string
-	default "davinci"
-
 config SYS_CONFIG_NAME
 	string
 	default "da830evm"
@@ -24,10 +16,6 @@ endif
 
 if TARGET_DA850EVM
 
-config SYS_CPU
-	string
-	default "arm926ejs"
-
 config SYS_BOARD
 	string
 	default "da8xxevm"
@@ -36,10 +24,6 @@ config SYS_VENDOR
 	string
 	default "davinci"
 
-config SYS_SOC
-	string
-	default "davinci"
-
 config SYS_CONFIG_NAME
 	string
 	default "da850evm"
@@ -48,10 +32,6 @@ endif
 
 if TARGET_HAWKBOARD
 
-config SYS_CPU
-	string
-	default "arm926ejs"
-
 config SYS_BOARD
 	string
 	default "da8xxevm"
@@ -60,10 +40,6 @@ config SYS_VENDOR
 	string
 	default "davinci"
 
-config SYS_SOC
-	string
-	default "davinci"
-
 config SYS_CONFIG_NAME
 	string
 	default "hawkboard"
diff --git a/board/davinci/dm355evm/Kconfig b/board/davinci/dm355evm/Kconfig
index 2dbb50991d8fca3cb2b47e46638bba750417d866..7490bc0f2dfc0643df5b72014eddd3d098db2013 100644
--- a/board/davinci/dm355evm/Kconfig
+++ b/board/davinci/dm355evm/Kconfig
@@ -1,9 +1,5 @@
 if TARGET_DAVINCI_DM355EVM
 
-config SYS_CPU
-	string
-	default "arm926ejs"
-
 config SYS_BOARD
 	string
 	default "dm355evm"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "davinci"
 
-config SYS_SOC
-	string
-	default "davinci"
-
 config SYS_CONFIG_NAME
 	string
 	default "davinci_dm355evm"
diff --git a/board/davinci/dm355leopard/Kconfig b/board/davinci/dm355leopard/Kconfig
index 345704fff3cca9182d90165a3717cca0da9514b5..73a53ffb9d6a0088668baa03d294ff253aa24096 100644
--- a/board/davinci/dm355leopard/Kconfig
+++ b/board/davinci/dm355leopard/Kconfig
@@ -1,9 +1,5 @@
 if TARGET_DAVINCI_DM355LEOPARD
 
-config SYS_CPU
-	string
-	default "arm926ejs"
-
 config SYS_BOARD
 	string
 	default "dm355leopard"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "davinci"
 
-config SYS_SOC
-	string
-	default "davinci"
-
 config SYS_CONFIG_NAME
 	string
 	default "davinci_dm355leopard"
diff --git a/board/davinci/dm365evm/Kconfig b/board/davinci/dm365evm/Kconfig
index d5f7ea2131a95d2197e8dacb6dc0368aca8d1dd4..266c6eea2718a211adc5d3742088897dc195eff7 100644
--- a/board/davinci/dm365evm/Kconfig
+++ b/board/davinci/dm365evm/Kconfig
@@ -1,9 +1,5 @@
 if TARGET_DAVINCI_DM365EVM
 
-config SYS_CPU
-	string
-	default "arm926ejs"
-
 config SYS_BOARD
 	string
 	default "dm365evm"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "davinci"
 
-config SYS_SOC
-	string
-	default "davinci"
-
 config SYS_CONFIG_NAME
 	string
 	default "davinci_dm365evm"
diff --git a/board/davinci/dm6467evm/Kconfig b/board/davinci/dm6467evm/Kconfig
index f7b225d05f97ca7945c2ca440269d3b748b317aa..1c4d0f0b686c644063827de407df1bf2522f7c7b 100644
--- a/board/davinci/dm6467evm/Kconfig
+++ b/board/davinci/dm6467evm/Kconfig
@@ -1,9 +1,5 @@
 if TARGET_DAVINCI_DM6467EVM
 
-config SYS_CPU
-	string
-	default "arm926ejs"
-
 config SYS_BOARD
 	string
 	default "dm6467evm"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "davinci"
 
-config SYS_SOC
-	string
-	default "davinci"
-
 config SYS_CONFIG_NAME
 	string
 	default "davinci_dm6467evm"
diff --git a/board/davinci/dvevm/Kconfig b/board/davinci/dvevm/Kconfig
index 7a2d86baecfbeb24e0a73d5a600de848f95cc63f..e020f8d55d2c18ab00ec39126f67c4a7740ab003 100644
--- a/board/davinci/dvevm/Kconfig
+++ b/board/davinci/dvevm/Kconfig
@@ -1,9 +1,5 @@
 if TARGET_DAVINCI_DVEVM
 
-config SYS_CPU
-	string
-	default "arm926ejs"
-
 config SYS_BOARD
 	string
 	default "dvevm"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "davinci"
 
-config SYS_SOC
-	string
-	default "davinci"
-
 config SYS_CONFIG_NAME
 	string
 	default "davinci_dvevm"
diff --git a/board/davinci/ea20/Kconfig b/board/davinci/ea20/Kconfig
index afab821598ed1eecc7280ef71bc04f94b5957d76..93950fd2ff1a21a9c9b61db87128ae768ed53e8e 100644
--- a/board/davinci/ea20/Kconfig
+++ b/board/davinci/ea20/Kconfig
@@ -1,9 +1,5 @@
 if TARGET_EA20
 
-config SYS_CPU
-	string
-	default "arm926ejs"
-
 config SYS_BOARD
 	string
 	default "ea20"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "davinci"
 
-config SYS_SOC
-	string
-	default "davinci"
-
 config SYS_CONFIG_NAME
 	string
 	default "ea20"
diff --git a/board/davinci/schmoogie/Kconfig b/board/davinci/schmoogie/Kconfig
index 45401e411763d8f1e62ae600403c62b6d1795164..7aa459deb5d4ab5fb07bf2e222b7cdd15f79898b 100644
--- a/board/davinci/schmoogie/Kconfig
+++ b/board/davinci/schmoogie/Kconfig
@@ -1,9 +1,5 @@
 if TARGET_DAVINCI_SCHMOOGIE
 
-config SYS_CPU
-	string
-	default "arm926ejs"
-
 config SYS_BOARD
 	string
 	default "schmoogie"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "davinci"
 
-config SYS_SOC
-	string
-	default "davinci"
-
 config SYS_CONFIG_NAME
 	string
 	default "davinci_schmoogie"
diff --git a/board/davinci/sffsdr/Kconfig b/board/davinci/sffsdr/Kconfig
index aeb7ef22ebfd8fc39bba1e58c9b2d118d20f23d7..95461fc043d69dda71e402489606849ad614a668 100644
--- a/board/davinci/sffsdr/Kconfig
+++ b/board/davinci/sffsdr/Kconfig
@@ -1,9 +1,5 @@
 if TARGET_DAVINCI_SFFSDR
 
-config SYS_CPU
-	string
-	default "arm926ejs"
-
 config SYS_BOARD
 	string
 	default "sffsdr"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "davinci"
 
-config SYS_SOC
-	string
-	default "davinci"
-
 config SYS_CONFIG_NAME
 	string
 	default "davinci_sffsdr"
diff --git a/board/davinci/sonata/Kconfig b/board/davinci/sonata/Kconfig
index 2cf50359a4255fd5c11a7119be3b151bfaf848ca..a21fb8ed803c889ac110f18ef14079985f348bfc 100644
--- a/board/davinci/sonata/Kconfig
+++ b/board/davinci/sonata/Kconfig
@@ -1,9 +1,5 @@
 if TARGET_DAVINCI_SONATA
 
-config SYS_CPU
-	string
-	default "arm926ejs"
-
 config SYS_BOARD
 	string
 	default "sonata"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "davinci"
 
-config SYS_SOC
-	string
-	default "davinci"
-
 config SYS_CONFIG_NAME
 	string
 	default "davinci_sonata"
diff --git a/board/enbw/enbw_cmc/Kconfig b/board/enbw/enbw_cmc/Kconfig
index e061e7e4bf3bed8302c22874c38cd146db947926..183334b292201fd6cc7d91e9a4e0d0a5ce7f25ad 100644
--- a/board/enbw/enbw_cmc/Kconfig
+++ b/board/enbw/enbw_cmc/Kconfig
@@ -1,9 +1,5 @@
 if TARGET_ENBW_CMC
 
-config SYS_CPU
-	string
-	default "arm926ejs"
-
 config SYS_BOARD
 	string
 	default "enbw_cmc"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "enbw"
 
-config SYS_SOC
-	string
-	default "davinci"
-
 config SYS_CONFIG_NAME
 	string
 	default "enbw_cmc"
diff --git a/board/omicron/calimain/Kconfig b/board/omicron/calimain/Kconfig
index 923af8a364c92ef35c372cbfbf7e7e52b62460ec..46e95d89dc1f9bb1d8156a23557bd54d1cf1c7be 100644
--- a/board/omicron/calimain/Kconfig
+++ b/board/omicron/calimain/Kconfig
@@ -1,9 +1,5 @@
 if TARGET_CALIMAIN
 
-config SYS_CPU
-	string
-	default "arm926ejs"
-
 config SYS_BOARD
 	string
 	default "calimain"
@@ -12,10 +8,6 @@ config SYS_VENDOR
 	string
 	default "omicron"
 
-config SYS_SOC
-	string
-	default "davinci"
-
 config SYS_CONFIG_NAME
 	string
 	default "calimain"
diff --git a/configs/calimain_defconfig b/configs/calimain_defconfig
index a808ddf28f878dcf4c83a02bbdce438d0e7c0f39..02d391203bab4ce1b99c8a35644253b17500012f 100644
--- a/configs/calimain_defconfig
+++ b/configs/calimain_defconfig
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_CALIMAIN=y
diff --git a/configs/cam_enc_4xx_defconfig b/configs/cam_enc_4xx_defconfig
index 1417d8309ce1c4ecab08e79fec3e79fa86690527..dfdda82f0a5d30f67ccbbe1b4b901484d3f710fc 100644
--- a/configs/cam_enc_4xx_defconfig
+++ b/configs/cam_enc_4xx_defconfig
@@ -1,3 +1,4 @@
 CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_ARCH_DAVINCI=y
 +S:CONFIG_TARGET_CAM_ENC_4XX=y
diff --git a/configs/da830evm_defconfig b/configs/da830evm_defconfig
index 49e74c30e0ef84bf61d418a5a3e42ecd88468537..d27cdb083d54257527b37b843dc11235014b4708 100644
--- a/configs/da830evm_defconfig
+++ b/configs/da830evm_defconfig
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_DA830EVM=y
diff --git a/configs/da850_am18xxevm_defconfig b/configs/da850_am18xxevm_defconfig
index af419cea51e8f30c84ba1343d849e51a4c5dcfd7..a79a0a8c420e75d3e2af3222b029f14e1126fc5f 100644
--- a/configs/da850_am18xxevm_defconfig
+++ b/configs/da850_am18xxevm_defconfig
@@ -1,4 +1,5 @@
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="DA850_AM18X_EVM,MAC_ADDR_IN_EEPROM,SYS_I2C_EEPROM_ADDR_LEN=2,SYS_I2C_EEPROM_ADDR=0x50"
 +S:CONFIG_ARM=y
++S:CONFIG_ARCH_DAVINCI=y
 +S:CONFIG_TARGET_DA850EVM=y
diff --git a/configs/da850evm_defconfig b/configs/da850evm_defconfig
index 7517e9272090a4ba7a6451a591b0e60fb1270d8e..afdce5ed25aa109d32d888b14798b5a0198a9cd9 100644
--- a/configs/da850evm_defconfig
+++ b/configs/da850evm_defconfig
@@ -1,4 +1,5 @@
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="MAC_ADDR_IN_SPIFLASH"
 +S:CONFIG_ARM=y
++S:CONFIG_ARCH_DAVINCI=y
 +S:CONFIG_TARGET_DA850EVM=y
diff --git a/configs/da850evm_direct_nor_defconfig b/configs/da850evm_direct_nor_defconfig
index edc604a866824aa21eb78b7331b98ff6635c8fae..25c303c84747fe8e46e76cbf0c112705c2419054 100644
--- a/configs/da850evm_direct_nor_defconfig
+++ b/configs/da850evm_direct_nor_defconfig
@@ -1,3 +1,4 @@
 CONFIG_SYS_EXTRA_OPTIONS="MAC_ADDR_IN_SPIFLASH,USE_NOR,DIRECT_NOR_BOOT"
 CONFIG_ARM=y
+CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_DA850EVM=y
diff --git a/configs/davinci_dm355evm_defconfig b/configs/davinci_dm355evm_defconfig
index ef0b8545c2188ab51136ddd4ee67f60e7fd4dc62..d3a03b216ce16c844fd228b9af86894dceeac794 100644
--- a/configs/davinci_dm355evm_defconfig
+++ b/configs/davinci_dm355evm_defconfig
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_DAVINCI_DM355EVM=y
diff --git a/configs/davinci_dm355leopard_defconfig b/configs/davinci_dm355leopard_defconfig
index 22da9f30f34a88663e954ee8d339d78ff04847c4..875c0b5e5d8b71b5626c3ff38d23cf4526c689f1 100644
--- a/configs/davinci_dm355leopard_defconfig
+++ b/configs/davinci_dm355leopard_defconfig
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_DAVINCI_DM355LEOPARD=y
diff --git a/configs/davinci_dm365evm_defconfig b/configs/davinci_dm365evm_defconfig
index dfae0b2a613442f587ac644b9f2ef3160368780f..f841fd941dc456f634b5aa241f04619d438d9389 100644
--- a/configs/davinci_dm365evm_defconfig
+++ b/configs/davinci_dm365evm_defconfig
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_DAVINCI_DM365EVM=y
diff --git a/configs/davinci_dm6467Tevm_defconfig b/configs/davinci_dm6467Tevm_defconfig
index e2c2de4b110b76d4388f5a39a79f693e6e22f8d2..4523d4a0d0bcced2c016b4f5e1923f5df7892ecc 100644
--- a/configs/davinci_dm6467Tevm_defconfig
+++ b/configs/davinci_dm6467Tevm_defconfig
@@ -1,3 +1,4 @@
 CONFIG_SYS_EXTRA_OPTIONS="DAVINCI_DM6467TEVM,REFCLK_FREQ=33000000"
 CONFIG_ARM=y
+CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_DAVINCI_DM6467EVM=y
diff --git a/configs/davinci_dm6467evm_defconfig b/configs/davinci_dm6467evm_defconfig
index abd349131cc6f10436d03c782ec1efbe3ad3f829..5208257029a8ce8a6c0bbf2ddd9f048529bbd825 100644
--- a/configs/davinci_dm6467evm_defconfig
+++ b/configs/davinci_dm6467evm_defconfig
@@ -1,3 +1,4 @@
 CONFIG_SYS_EXTRA_OPTIONS="REFCLK_FREQ=27000000"
 CONFIG_ARM=y
+CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_DAVINCI_DM6467EVM=y
diff --git a/configs/davinci_dvevm_defconfig b/configs/davinci_dvevm_defconfig
index eb53692a6419d58472811c6f0c0b5f40e5c01506..74e55b97d11a6d333d3d7a69b8361c9354818fc3 100644
--- a/configs/davinci_dvevm_defconfig
+++ b/configs/davinci_dvevm_defconfig
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_DAVINCI_DVEVM=y
diff --git a/configs/davinci_schmoogie_defconfig b/configs/davinci_schmoogie_defconfig
index bc166ab12c93a92ae8a87e0bae90eef3cac159ad..64ed2c1fef955708adb01e0a7af7e409bac4d82f 100644
--- a/configs/davinci_schmoogie_defconfig
+++ b/configs/davinci_schmoogie_defconfig
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_DAVINCI_SCHMOOGIE=y
diff --git a/configs/davinci_sffsdr_defconfig b/configs/davinci_sffsdr_defconfig
index ea9cf886fffadaad68145db93e088efa590dbc62..9eb0f07b465a5491074c32fcac24ec8acd1c80d8 100644
--- a/configs/davinci_sffsdr_defconfig
+++ b/configs/davinci_sffsdr_defconfig
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_DAVINCI_SFFSDR=y
diff --git a/configs/davinci_sonata_defconfig b/configs/davinci_sonata_defconfig
index 2c9cd4f5e763d0b307b1e778945a56fa6bb36f00..d8f0f7724af1dd2eb96ac8d2fc0e8c350c51ad00 100644
--- a/configs/davinci_sonata_defconfig
+++ b/configs/davinci_sonata_defconfig
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_DAVINCI_SONATA=y
diff --git a/configs/ea20_defconfig b/configs/ea20_defconfig
index 562849dfec46fe34ff77fb69134c5c79c222e726..93676cd3f982d5d88c2460114e3b315931db68f0 100644
--- a/configs/ea20_defconfig
+++ b/configs/ea20_defconfig
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_EA20=y
diff --git a/configs/enbw_cmc_defconfig b/configs/enbw_cmc_defconfig
index 7fe405a39089f0a74d23e8fdd049e95fd15a38af..92c49268de5186327206c40f86631c96fa9aa2c6 100644
--- a/configs/enbw_cmc_defconfig
+++ b/configs/enbw_cmc_defconfig
@@ -1,2 +1,3 @@
 CONFIG_ARM=y
+CONFIG_ARCH_DAVINCI=y
 CONFIG_TARGET_ENBW_CMC=y
diff --git a/configs/hawkboard_defconfig b/configs/hawkboard_defconfig
index 9945fe5772a7fc1e3686189e20abc6e0b1ac945b..4084f9c019b0516dd639de25dd55ae34d05ad3f9 100644
--- a/configs/hawkboard_defconfig
+++ b/configs/hawkboard_defconfig
@@ -1,3 +1,4 @@
 CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_ARCH_DAVINCI=y
 +S:CONFIG_TARGET_HAWKBOARD=y
diff --git a/configs/hawkboard_uart_defconfig b/configs/hawkboard_uart_defconfig
index b4db29160169bcc34febca6a94e47f10fc8c1921..d7eeae7a29d790be900a112f068fd4c6f0ed8ce0 100644
--- a/configs/hawkboard_uart_defconfig
+++ b/configs/hawkboard_uart_defconfig
@@ -1,4 +1,5 @@
 CONFIG_SPL=y
 CONFIG_SYS_EXTRA_OPTIONS="UART_U_BOOT"
 +S:CONFIG_ARM=y
++S:CONFIG_ARCH_DAVINCI=y
 +S:CONFIG_TARGET_HAWKBOARD=y
diff --git a/configs/ipam390_defconfig b/configs/ipam390_defconfig
index 6e959516c218af626860a6804fc7cebd152ac52f..4fefcbee76d01582e8ffa9c98a1d9dd12b186b20 100644
--- a/configs/ipam390_defconfig
+++ b/configs/ipam390_defconfig
@@ -1,3 +1,4 @@
 CONFIG_SPL=y
 +S:CONFIG_ARM=y
++S:CONFIG_ARCH_DAVINCI=y
 +S:CONFIG_TARGET_IPAM390=y