summaryrefslogtreecommitdiff
path: root/board/mediatek
diff options
context:
space:
mode:
authorGuillaume La Roque <glaroque@baylibre.com>2021-09-10 10:21:06 +0200
committerTom Rini <trini@konsulko.com>2021-09-23 14:15:32 -0400
commitdf3ab898f644db6d8b7337f0a7f0995ecf41b730 (patch)
tree36eb2fdd597ffea2d5437b9ee9c71caebea48696 /board/mediatek
parenta69753f31d5863c692522f0b92db6e9cad06d553 (diff)
downloadu-boot-df3ab898f644db6d8b7337f0a7f0995ecf41b730.tar.gz
u-boot-df3ab898f644db6d8b7337f0a7f0995ecf41b730.tar.bz2
u-boot-df3ab898f644db6d8b7337f0a7f0995ecf41b730.zip
arm: mediatek: merge board Kconfigs into mach-mediatek
On MediaTek boards we cannot override the SYS_BOARD / SYS_CONFIG_NAME variables from defconfig. This is because in board/mediatek/mtXXXX/Kconfig this value was override by default due to the if CONFIG_TARGET_MTXXXX condition. Merge all the Kconfigs to the mach-medatek/Kconfig. This way: - we only define SYS_{SOC,VENDOR} once - all board definitions are in a single place, simplifying the build logic. Signed-off-by: Guillaume La Roque <glaroque@baylibre.com>
Diffstat (limited to 'board/mediatek')
-rw-r--r--board/mediatek/mt7620/Kconfig12
-rw-r--r--board/mediatek/mt7622/Kconfig17
-rw-r--r--board/mediatek/mt7623/Kconfig13
-rw-r--r--board/mediatek/mt7628/Kconfig12
-rw-r--r--board/mediatek/mt7629/Kconfig17
-rw-r--r--board/mediatek/mt8183/Kconfig13
-rw-r--r--board/mediatek/mt8512/Kconfig14
-rw-r--r--board/mediatek/mt8516/Kconfig13
-rw-r--r--board/mediatek/mt8518/Kconfig14
9 files changed, 0 insertions, 125 deletions
diff --git a/board/mediatek/mt7620/Kconfig b/board/mediatek/mt7620/Kconfig
deleted file mode 100644
index b9137adcc9..0000000000
--- a/board/mediatek/mt7620/Kconfig
+++ /dev/null
@@ -1,12 +0,0 @@
-if BOARD_MT7620_RFB || BOARD_MT7620_MT7530_RFB
-
-config SYS_BOARD
- default "mt7620"
-
-config SYS_VENDOR
- default "mediatek"
-
-config SYS_CONFIG_NAME
- default "mt7620"
-
-endif
diff --git a/board/mediatek/mt7622/Kconfig b/board/mediatek/mt7622/Kconfig
deleted file mode 100644
index d0abdc0a67..0000000000
--- a/board/mediatek/mt7622/Kconfig
+++ /dev/null
@@ -1,17 +0,0 @@
-if TARGET_MT7622
-
-config SYS_BOARD
- default "mt7622"
-
-config SYS_CONFIG_NAME
- default "mt7622"
-
-config MTK_BROM_HEADER_INFO
- string
- default "lk=1"
-
-config MTK_BROM_HEADER_INFO
- string
- default "media=nor"
-
-endif
diff --git a/board/mediatek/mt7623/Kconfig b/board/mediatek/mt7623/Kconfig
deleted file mode 100644
index a8c670e71f..0000000000
--- a/board/mediatek/mt7623/Kconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-if TARGET_MT7623
-
-config SYS_BOARD
- default "mt7623"
-
-config SYS_CONFIG_NAME
- default "mt7623"
-
-config MTK_BROM_HEADER_INFO
- string
- default "lk=1"
-
-endif
diff --git a/board/mediatek/mt7628/Kconfig b/board/mediatek/mt7628/Kconfig
deleted file mode 100644
index d6b6f9d632..0000000000
--- a/board/mediatek/mt7628/Kconfig
+++ /dev/null
@@ -1,12 +0,0 @@
-if BOARD_MT7628_RFB
-
-config SYS_BOARD
- default "mt7628"
-
-config SYS_VENDOR
- default "mediatek"
-
-config SYS_CONFIG_NAME
- default "mt7628"
-
-endif
diff --git a/board/mediatek/mt7629/Kconfig b/board/mediatek/mt7629/Kconfig
deleted file mode 100644
index 6055164b52..0000000000
--- a/board/mediatek/mt7629/Kconfig
+++ /dev/null
@@ -1,17 +0,0 @@
-if TARGET_MT7629
-
-config SYS_BOARD
- default "mt7629"
-
-config SYS_CONFIG_NAME
- default "mt7629"
-
-config MTK_SPL_PAD_SIZE
- hex
- default 0x10000
-
-config MTK_BROM_HEADER_INFO
- string
- default "media=nor"
-
-endif
diff --git a/board/mediatek/mt8183/Kconfig b/board/mediatek/mt8183/Kconfig
deleted file mode 100644
index b75c3b8d80..0000000000
--- a/board/mediatek/mt8183/Kconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-if TARGET_MT8183
-
-config SYS_BOARD
- default "mt8183"
-
-config SYS_CONFIG_NAME
- default "mt8183"
-
-config MTK_BROM_HEADER_INFO
- string
- default "media=emmc"
-
-endif
diff --git a/board/mediatek/mt8512/Kconfig b/board/mediatek/mt8512/Kconfig
deleted file mode 100644
index 87bd1fbe69..0000000000
--- a/board/mediatek/mt8512/Kconfig
+++ /dev/null
@@ -1,14 +0,0 @@
-if TARGET_MT8512
-
-config SYS_BOARD
- default "mt8512"
-
-config SYS_CONFIG_NAME
- default "mt8512"
-
-
-config MTK_BROM_HEADER_INFO
- string
- default "media=nor"
-
-endif
diff --git a/board/mediatek/mt8516/Kconfig b/board/mediatek/mt8516/Kconfig
deleted file mode 100644
index a87d3872fe..0000000000
--- a/board/mediatek/mt8516/Kconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-if TARGET_MT8516
-
-config SYS_BOARD
- default "mt8516"
-
-config SYS_CONFIG_NAME
- default "mt8516"
-
-config MTK_BROM_HEADER_INFO
- string
- default "media=emmc"
-
-endif
diff --git a/board/mediatek/mt8518/Kconfig b/board/mediatek/mt8518/Kconfig
deleted file mode 100644
index 1971c4d8c3..0000000000
--- a/board/mediatek/mt8518/Kconfig
+++ /dev/null
@@ -1,14 +0,0 @@
-if TARGET_MT8518
-
-config SYS_BOARD
- default "mt8518"
-
-config SYS_CONFIG_NAME
- default "mt8518"
-
-
-config MTK_BROM_HEADER_INFO
- string
- default "media=nor"
-
-endif