Merge branch 'master' of git://git.denx.de/u-boot-arm

18 files changed, 0 insertions, 54 deletions

diff --git a/board/amcc/acadia/Kconfig b/board/amcc/acadia/Kconfig
index 096f02e..033deaf 100644
--- a/board/amcc/acadia/Kconfig
+++ b/board/amcc/acadia/Kconfig
@@ -1,15 +1,12 @@
 if TARGET_ACADIA
 
 config SYS_BOARD
-	string
 	default "acadia"
 
 config SYS_VENDOR
-	string
 	default "amcc"
 
 config SYS_CONFIG_NAME
-	string
 	default "acadia"
 
 endif
diff --git a/board/amcc/bamboo/Kconfig b/board/amcc/bamboo/Kconfig
index a002cfa..c0bd40a 100644
--- a/board/amcc/bamboo/Kconfig
+++ b/board/amcc/bamboo/Kconfig
@@ -1,15 +1,12 @@
 if TARGET_BAMBOO
 
 config SYS_BOARD
-	string
 	default "bamboo"
 
 config SYS_VENDOR
-	string
 	default "amcc"
 
 config SYS_CONFIG_NAME
-	string
 	default "bamboo"
 
 endif
diff --git a/board/amcc/bluestone/Kconfig b/board/amcc/bluestone/Kconfig
index 2f5999d..255e013 100644
--- a/board/amcc/bluestone/Kconfig
+++ b/board/amcc/bluestone/Kconfig
@@ -1,15 +1,12 @@
 if TARGET_BLUESTONE
 
 config SYS_BOARD
-	string
 	default "bluestone"
 
 config SYS_VENDOR
-	string
 	default "amcc"
 
 config SYS_CONFIG_NAME
-	string
 	default "bluestone"
 
 endif
diff --git a/board/amcc/bubinga/Kconfig b/board/amcc/bubinga/Kconfig
index 29f769b..540d9b6 100644
--- a/board/amcc/bubinga/Kconfig
+++ b/board/amcc/bubinga/Kconfig
@@ -1,15 +1,12 @@
 if TARGET_BUBINGA
 
 config SYS_BOARD
-	string
 	default "bubinga"
 
 config SYS_VENDOR
-	string
 	default "amcc"
 
 config SYS_CONFIG_NAME
-	string
 	default "bubinga"
 
 endif
diff --git a/board/amcc/canyonlands/Kconfig b/board/amcc/canyonlands/Kconfig
index 545056a..530a6ef 100644
--- a/board/amcc/canyonlands/Kconfig
+++ b/board/amcc/canyonlands/Kconfig
@@ -1,15 +1,12 @@
 if TARGET_CANYONLANDS
 
 config SYS_BOARD
-	string
 	default "canyonlands"
 
 config SYS_VENDOR
-	string
 	default "amcc"
 
 config SYS_CONFIG_NAME
-	string
 	default "canyonlands"
 
 endif
diff --git a/board/amcc/ebony/Kconfig b/board/amcc/ebony/Kconfig
index cc1448f..62394b6 100644
--- a/board/amcc/ebony/Kconfig
+++ b/board/amcc/ebony/Kconfig
@@ -1,15 +1,12 @@
 if TARGET_EBONY
 
 config SYS_BOARD
-	string
 	default "ebony"
 
 config SYS_VENDOR
-	string
 	default "amcc"
 
 config SYS_CONFIG_NAME
-	string
 	default "ebony"
 
 endif
diff --git a/board/amcc/katmai/Kconfig b/board/amcc/katmai/Kconfig
index 2a8d783..fc606cf 100644
--- a/board/amcc/katmai/Kconfig
+++ b/board/amcc/katmai/Kconfig
@@ -1,15 +1,12 @@
 if TARGET_KATMAI
 
 config SYS_BOARD
-	string
 	default "katmai"
 
 config SYS_VENDOR
-	string
 	default "amcc"
 
 config SYS_CONFIG_NAME
-	string
 	default "katmai"
 
 endif
diff --git a/board/amcc/kilauea/Kconfig b/board/amcc/kilauea/Kconfig
index 3564cc3..3f2f434 100644
--- a/board/amcc/kilauea/Kconfig
+++ b/board/amcc/kilauea/Kconfig
@@ -1,15 +1,12 @@
 if TARGET_KILAUEA
 
 config SYS_BOARD
-	string
 	default "kilauea"
 
 config SYS_VENDOR
-	string
 	default "amcc"
 
 config SYS_CONFIG_NAME
-	string
 	default "kilauea"
 
 endif
diff --git a/board/amcc/luan/Kconfig b/board/amcc/luan/Kconfig
index 7f19980..3df90af 100644
--- a/board/amcc/luan/Kconfig
+++ b/board/amcc/luan/Kconfig
@@ -1,15 +1,12 @@
 if TARGET_LUAN
 
 config SYS_BOARD
-	string
 	default "luan"
 
 config SYS_VENDOR
-	string
 	default "amcc"
 
 config SYS_CONFIG_NAME
-	string
 	default "luan"
 
 endif
diff --git a/board/amcc/makalu/Kconfig b/board/amcc/makalu/Kconfig
index 7f95bdc..31ce5f1 100644
--- a/board/amcc/makalu/Kconfig
+++ b/board/amcc/makalu/Kconfig
@@ -1,15 +1,12 @@
 if TARGET_MAKALU
 
 config SYS_BOARD
-	string
 	default "makalu"
 
 config SYS_VENDOR
-	string
 	default "amcc"
 
 config SYS_CONFIG_NAME
-	string
 	default "makalu"
 
 endif
diff --git a/board/amcc/ocotea/Kconfig b/board/amcc/ocotea/Kconfig
index 5eaf812..18c1a15 100644
--- a/board/amcc/ocotea/Kconfig
+++ b/board/amcc/ocotea/Kconfig
@@ -1,15 +1,12 @@
 if TARGET_OCOTEA
 
 config SYS_BOARD
-	string
 	default "ocotea"
 
 config SYS_VENDOR
-	string
 	default "amcc"
 
 config SYS_CONFIG_NAME
-	string
 	default "ocotea"
 
 endif
diff --git a/board/amcc/redwood/Kconfig b/board/amcc/redwood/Kconfig
index 001d400..d710590 100644
--- a/board/amcc/redwood/Kconfig
+++ b/board/amcc/redwood/Kconfig
@@ -1,15 +1,12 @@
 if TARGET_REDWOOD
 
 config SYS_BOARD
-	string
 	default "redwood"
 
 config SYS_VENDOR
-	string
 	default "amcc"
 
 config SYS_CONFIG_NAME
-	string
 	default "redwood"
 
 endif
diff --git a/board/amcc/sequoia/Kconfig b/board/amcc/sequoia/Kconfig
index ddcaced..67ee3ca 100644
--- a/board/amcc/sequoia/Kconfig
+++ b/board/amcc/sequoia/Kconfig
@@ -1,15 +1,12 @@
 if TARGET_SEQUOIA
 
 config SYS_BOARD
-	string
 	default "sequoia"
 
 config SYS_VENDOR
-	string
 	default "amcc"
 
 config SYS_CONFIG_NAME
-	string
 	default "sequoia"
 
 endif
diff --git a/board/amcc/taihu/Kconfig b/board/amcc/taihu/Kconfig
index 8411a82..fc5cb1d 100644
--- a/board/amcc/taihu/Kconfig
+++ b/board/amcc/taihu/Kconfig
@@ -1,15 +1,12 @@
 if TARGET_TAIHU
 
 config SYS_BOARD
-	string
 	default "taihu"
 
 config SYS_VENDOR
-	string
 	default "amcc"
 
 config SYS_CONFIG_NAME
-	string
 	default "taihu"
 
 endif
diff --git a/board/amcc/taishan/Kconfig b/board/amcc/taishan/Kconfig
index 0022063..abd07f5 100644
--- a/board/amcc/taishan/Kconfig
+++ b/board/amcc/taishan/Kconfig
@@ -1,15 +1,12 @@
 if TARGET_TAISHAN
 
 config SYS_BOARD
-	string
 	default "taishan"
 
 config SYS_VENDOR
-	string
 	default "amcc"
 
 config SYS_CONFIG_NAME
-	string
 	default "taishan"
 
 endif
diff --git a/board/amcc/walnut/Kconfig b/board/amcc/walnut/Kconfig
index f98cec5..94e3dc9 100644
--- a/board/amcc/walnut/Kconfig
+++ b/board/amcc/walnut/Kconfig
@@ -1,15 +1,12 @@
 if TARGET_WALNUT
 
 config SYS_BOARD
-	string
 	default "walnut"
 
 config SYS_VENDOR
-	string
 	default "amcc"
 
 config SYS_CONFIG_NAME
-	string
 	default "walnut"
 
 endif
diff --git a/board/amcc/yosemite/Kconfig b/board/amcc/yosemite/Kconfig
index 8aa62c0..dfa1068 100644
--- a/board/amcc/yosemite/Kconfig
+++ b/board/amcc/yosemite/Kconfig
@@ -1,15 +1,12 @@
 if TARGET_YOSEMITE
 
 config SYS_BOARD
-	string
 	default "yosemite"
 
 config SYS_VENDOR
-	string
 	default "amcc"
 
 config SYS_CONFIG_NAME
-	string
 	default "yosemite"
 
 endif
diff --git a/board/amcc/yucca/Kconfig b/board/amcc/yucca/Kconfig
index 945333f..61d9589 100644
--- a/board/amcc/yucca/Kconfig
+++ b/board/amcc/yucca/Kconfig
@@ -1,15 +1,12 @@
 if TARGET_YUCCA
 
 config SYS_BOARD
-	string
 	default "yucca"
 
 config SYS_VENDOR
-	string
 	default "amcc"
 
 config SYS_CONFIG_NAME
-	string
 	default "yucca"
 
 endif