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

Conflicts:
	boards.cfg

Signed-off-by: Stefano Babic <sbabic@denx.de>

10 files changed, 496 insertions, 0 deletions

diff --git a/board/tqc/tqm5200/Kconfig b/board/tqc/tqm5200/Kconfig
new file mode 100644
index 0000000000..c692196550
--- /dev/null
+++ b/board/tqc/tqm5200/Kconfig
@@ -0,0 +1,63 @@
+if TARGET_AEV
+
+config SYS_BOARD
+	string
+	default "tqm5200"
+
+config SYS_VENDOR
+	string
+	default "tqc"
+
+config SYS_CONFIG_NAME
+	string
+	default "aev"
+
+endif
+
+if TARGET_CHARON
+
+config SYS_BOARD
+	string
+	default "tqm5200"
+
+config SYS_VENDOR
+	string
+	default "tqc"
+
+config SYS_CONFIG_NAME
+	string
+	default "charon"
+
+endif
+
+if TARGET_TB5200
+
+config SYS_BOARD
+	string
+	default "tqm5200"
+
+config SYS_VENDOR
+	string
+	default "tqc"
+
+config SYS_CONFIG_NAME
+	string
+	default "TB5200"
+
+endif
+
+if TARGET_TQM5200
+
+config SYS_BOARD
+	string
+	default "tqm5200"
+
+config SYS_VENDOR
+	string
+	default "tqc"
+
+config SYS_CONFIG_NAME
+	string
+	default "TQM5200"
+
+endif
diff --git a/board/tqc/tqm5200/MAINTAINERS b/board/tqc/tqm5200/MAINTAINERS
new file mode 100644
index 0000000000..581ef95453
--- /dev/null
+++ b/board/tqc/tqm5200/MAINTAINERS
@@ -0,0 +1,26 @@
+TQM5200 BOARD
+M:	-
+S:	Maintained
+F:	board/tqc/tqm5200/
+F:	include/configs/aev.h
+F:	configs/aev_defconfig
+F:	include/configs/TQM5200.h
+F:	configs/cam5200_defconfig
+F:	configs/cam5200_niosflash_defconfig
+F:	configs/fo300_defconfig
+F:	configs/MiniFAP_defconfig
+F:	include/configs/TB5200.h
+F:	configs/TB5200_defconfig
+F:	configs/TB5200_B_defconfig
+F:	configs/TQM5200_defconfig
+F:	configs/TQM5200_B_defconfig
+F:	configs/TQM5200_B_HIGHBOOT_defconfig
+F:	configs/TQM5200_STK100_defconfig
+F:	configs/TQM5200S_defconfig
+F:	configs/TQM5200S_HIGHBOOT_defconfig
+
+CHARON BOARD
+M:	Heiko Schocher <hs@denx.de>
+S:	Maintained
+F:	include/configs/charon.h
+F:	configs/charon_defconfig
diff --git a/board/tqc/tqm8260/Kconfig b/board/tqc/tqm8260/Kconfig
new file mode 100644
index 0000000000..0cf80ddb80
--- /dev/null
+++ b/board/tqc/tqm8260/Kconfig
@@ -0,0 +1,15 @@
+if TARGET_TQM8260
+
+config SYS_BOARD
+	string
+	default "tqm8260"
+
+config SYS_VENDOR
+	string
+	default "tqc"
+
+config SYS_CONFIG_NAME
+	string
+	default "TQM8260"
+
+endif
diff --git a/board/tqc/tqm8260/MAINTAINERS b/board/tqc/tqm8260/MAINTAINERS
new file mode 100644
index 0000000000..266910fe05
--- /dev/null
+++ b/board/tqc/tqm8260/MAINTAINERS
@@ -0,0 +1,16 @@
+TQM8260 BOARD
+M:	Wolfgang Denk <wd@denx.de>
+S:	Maintained
+F:	board/tqc/tqm8260/
+F:	include/configs/TQM8260.h
+F:	configs/TQM8255_AA_defconfig
+F:	configs/TQM8260_AA_defconfig
+F:	configs/TQM8260_AB_defconfig
+F:	configs/TQM8260_AC_defconfig
+F:	configs/TQM8260_AD_defconfig
+F:	configs/TQM8260_AE_defconfig
+F:	configs/TQM8260_AF_defconfig
+F:	configs/TQM8260_AG_defconfig
+F:	configs/TQM8260_AH_defconfig
+F:	configs/TQM8260_AI_defconfig
+F:	configs/TQM8265_AA_defconfig
diff --git a/board/tqc/tqm8272/Kconfig b/board/tqc/tqm8272/Kconfig
new file mode 100644
index 0000000000..9be43d3bae
--- /dev/null
+++ b/board/tqc/tqm8272/Kconfig
@@ -0,0 +1,15 @@
+if TARGET_TQM8272
+
+config SYS_BOARD
+	string
+	default "tqm8272"
+
+config SYS_VENDOR
+	string
+	default "tqc"
+
+config SYS_CONFIG_NAME
+	string
+	default "TQM8272"
+
+endif
diff --git a/board/tqc/tqm8272/MAINTAINERS b/board/tqc/tqm8272/MAINTAINERS
new file mode 100644
index 0000000000..a660de19bc
--- /dev/null
+++ b/board/tqc/tqm8272/MAINTAINERS
@@ -0,0 +1,6 @@
+TQM8272 BOARD
+M:	-
+S:	Maintained
+F:	board/tqc/tqm8272/
+F:	include/configs/TQM8272.h
+F:	configs/TQM8272_defconfig
diff --git a/board/tqc/tqm834x/Kconfig b/board/tqc/tqm834x/Kconfig
new file mode 100644
index 0000000000..cd2e817a4e
--- /dev/null
+++ b/board/tqc/tqm834x/Kconfig
@@ -0,0 +1,15 @@
+if TARGET_TQM834X
+
+config SYS_BOARD
+	string
+	default "tqm834x"
+
+config SYS_VENDOR
+	string
+	default "tqc"
+
+config SYS_CONFIG_NAME
+	string
+	default "TQM834x"
+
+endif
diff --git a/board/tqc/tqm834x/MAINTAINERS b/board/tqc/tqm834x/MAINTAINERS
new file mode 100644
index 0000000000..10c14f3e0b
--- /dev/null
+++ b/board/tqc/tqm834x/MAINTAINERS
@@ -0,0 +1,6 @@
+TQM834X BOARD
+M:	-
+S:	Maintained
+F:	board/tqc/tqm834x/
+F:	include/configs/TQM834x.h
+F:	configs/TQM834x_defconfig
diff --git a/board/tqc/tqm8xx/Kconfig b/board/tqc/tqm8xx/Kconfig
new file mode 100644
index 0000000000..5700d22162
--- /dev/null
+++ b/board/tqc/tqm8xx/Kconfig
@@ -0,0 +1,287 @@
+if TARGET_FPS850L
+
+config SYS_BOARD
+	string
+	default "tqm8xx"
+
+config SYS_VENDOR
+	string
+	default "tqc"
+
+config SYS_CONFIG_NAME
+	string
+	default "FPS850L"
+
+endif
+
+if TARGET_FPS860L
+
+config SYS_BOARD
+	string
+	default "tqm8xx"
+
+config SYS_VENDOR
+	string
+	default "tqc"
+
+config SYS_CONFIG_NAME
+	string
+	default "FPS860L"
+
+endif
+
+if TARGET_NSCU
+
+config SYS_BOARD
+	string
+	default "tqm8xx"
+
+config SYS_VENDOR
+	string
+	default "tqc"
+
+config SYS_CONFIG_NAME
+	string
+	default "NSCU"
+
+endif
+
+if TARGET_SM850
+
+config SYS_BOARD
+	string
+	default "tqm8xx"
+
+config SYS_VENDOR
+	string
+	default "tqc"
+
+config SYS_CONFIG_NAME
+	string
+	default "SM850"
+
+endif
+
+if TARGET_TK885D
+
+config SYS_BOARD
+	string
+	default "tqm8xx"
+
+config SYS_VENDOR
+	string
+	default "tqc"
+
+config SYS_CONFIG_NAME
+	string
+	default "TK885D"
+
+endif
+
+if TARGET_TQM823L
+
+config SYS_BOARD
+	string
+	default "tqm8xx"
+
+config SYS_VENDOR
+	string
+	default "tqc"
+
+config SYS_CONFIG_NAME
+	string
+	default "TQM823L"
+
+endif
+
+if TARGET_TQM823M
+
+config SYS_BOARD
+	string
+	default "tqm8xx"
+
+config SYS_VENDOR
+	string
+	default "tqc"
+
+config SYS_CONFIG_NAME
+	string
+	default "TQM823M"
+
+endif
+
+if TARGET_TQM850L
+
+config SYS_BOARD
+	string
+	default "tqm8xx"
+
+config SYS_VENDOR
+	string
+	default "tqc"
+
+config SYS_CONFIG_NAME
+	string
+	default "TQM850L"
+
+endif
+
+if TARGET_TQM850M
+
+config SYS_BOARD
+	string
+	default "tqm8xx"
+
+config SYS_VENDOR
+	string
+	default "tqc"
+
+config SYS_CONFIG_NAME
+	string
+	default "TQM850M"
+
+endif
+
+if TARGET_TQM855L
+
+config SYS_BOARD
+	string
+	default "tqm8xx"
+
+config SYS_VENDOR
+	string
+	default "tqc"
+
+config SYS_CONFIG_NAME
+	string
+	default "TQM855L"
+
+endif
+
+if TARGET_TQM855M
+
+config SYS_BOARD
+	string
+	default "tqm8xx"
+
+config SYS_VENDOR
+	string
+	default "tqc"
+
+config SYS_CONFIG_NAME
+	string
+	default "TQM855M"
+
+endif
+
+if TARGET_TQM860L
+
+config SYS_BOARD
+	string
+	default "tqm8xx"
+
+config SYS_VENDOR
+	string
+	default "tqc"
+
+config SYS_CONFIG_NAME
+	string
+	default "TQM860L"
+
+endif
+
+if TARGET_TQM860M
+
+config SYS_BOARD
+	string
+	default "tqm8xx"
+
+config SYS_VENDOR
+	string
+	default "tqc"
+
+config SYS_CONFIG_NAME
+	string
+	default "TQM860M"
+
+endif
+
+if TARGET_TQM862L
+
+config SYS_BOARD
+	string
+	default "tqm8xx"
+
+config SYS_VENDOR
+	string
+	default "tqc"
+
+config SYS_CONFIG_NAME
+	string
+	default "TQM862L"
+
+endif
+
+if TARGET_TQM862M
+
+config SYS_BOARD
+	string
+	default "tqm8xx"
+
+config SYS_VENDOR
+	string
+	default "tqc"
+
+config SYS_CONFIG_NAME
+	string
+	default "TQM862M"
+
+endif
+
+if TARGET_TQM866M
+
+config SYS_BOARD
+	string
+	default "tqm8xx"
+
+config SYS_VENDOR
+	string
+	default "tqc"
+
+config SYS_CONFIG_NAME
+	string
+	default "TQM866M"
+
+endif
+
+if TARGET_TQM885D
+
+config SYS_BOARD
+	string
+	default "tqm8xx"
+
+config SYS_VENDOR
+	string
+	default "tqc"
+
+config SYS_CONFIG_NAME
+	string
+	default "TQM885D"
+
+endif
+
+if TARGET_VIRTLAB2
+
+config SYS_BOARD
+	string
+	default "tqm8xx"
+
+config SYS_VENDOR
+	string
+	default "tqc"
+
+config SYS_CONFIG_NAME
+	string
+	default "virtlab2"
+
+endif
diff --git a/board/tqc/tqm8xx/MAINTAINERS b/board/tqc/tqm8xx/MAINTAINERS
new file mode 100644
index 0000000000..161fa68e5b
--- /dev/null
+++ b/board/tqc/tqm8xx/MAINTAINERS
@@ -0,0 +1,47 @@
+TQM8XX BOARD
+M:	Wolfgang Denk <wd@denx.de>
+S:	Maintained
+F:	board/tqc/tqm8xx/
+F:	include/configs/FPS850L.h
+F:	configs/FPS850L_defconfig
+F:	include/configs/FPS860L.h
+F:	configs/FPS860L_defconfig
+F:	include/configs/SM850.h
+F:	configs/SM850_defconfig
+F:	include/configs/TQM823L.h
+F:	configs/TQM823L_defconfig
+F:	configs/TQM823L_LCD_defconfig
+F:	include/configs/TQM823M.h
+F:	configs/TQM823M_defconfig
+F:	include/configs/TQM850L.h
+F:	configs/TQM850L_defconfig
+F:	include/configs/TQM850M.h
+F:	configs/TQM850M_defconfig
+F:	include/configs/TQM855L.h
+F:	configs/TQM855L_defconfig
+F:	include/configs/TQM855M.h
+F:	configs/TQM855M_defconfig
+F:	include/configs/TQM860L.h
+F:	configs/TQM860L_defconfig
+F:	include/configs/TQM860M.h
+F:	configs/TQM860M_defconfig
+F:	include/configs/TQM862L.h
+F:	configs/TQM862L_defconfig
+F:	include/configs/TQM862M.h
+F:	configs/TQM862M_defconfig
+F:	include/configs/TQM866M.h
+F:	configs/TQM866M_defconfig
+F:	include/configs/TQM885D.h
+F:	configs/TQM885D_defconfig
+F:	configs/TTTech_defconfig
+F:	include/configs/virtlab2.h
+F:	configs/virtlab2_defconfig
+F:	configs/wtk_defconfig
+
+NSCU BOARD
+M:	-
+S:	Maintained
+F:	include/configs/NSCU.h
+F:	configs/NSCU_defconfig
+F:	include/configs/TK885D.h
+F:	configs/TK885D_defconfig