summaryrefslogtreecommitdiffstats
path: root/board
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2015-06-06 07:03:07 -0400
committerTom Rini <trini@konsulko.com>2015-06-06 07:03:07 -0400
commit290ac3bb1a1fbd85abcecfd8ff8cb837029d067a (patch)
tree4c39ddea7744e46fb15c778f394a77f55bd28a84 /board
parentf1737152c01734749c3694d30e1aa86ab28f374e (diff)
parent277af820b5207d43473869da2c86412d2b51d461 (diff)
downloadtalos-obmc-uboot-290ac3bb1a1fbd85abcecfd8ff8cb837029d067a.tar.gz
talos-obmc-uboot-290ac3bb1a1fbd85abcecfd8ff8cb837029d067a.zip
Merge git://git.denx.de/u-boot-sunxi
Diffstat (limited to 'board')
-rw-r--r--board/sunxi/Kconfig6
-rw-r--r--board/sunxi/MAINTAINERS11
2 files changed, 12 insertions, 5 deletions
diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig
index e744d4af4e..b2eca51ffb 100644
--- a/board/sunxi/Kconfig
+++ b/board/sunxi/Kconfig
@@ -581,4 +581,10 @@ config DM_SERIAL
config DM_USB
default y if !USB_MUSB_SUNXI
+config CMD_SETEXPR
+ default y
+
+config CMD_NET
+ default y
+
endif
diff --git a/board/sunxi/MAINTAINERS b/board/sunxi/MAINTAINERS
index 22d560a233..7a42055559 100644
--- a/board/sunxi/MAINTAINERS
+++ b/board/sunxi/MAINTAINERS
@@ -10,6 +10,7 @@ F: configs/Cubieboard_defconfig
F: configs/Hyundai_A7HD_defconfig
F: configs/jesurun_q5_defconfig
F: configs/Mele_A1000_defconfig
+F: configs/Mele_A1000G_quad_defconfig
F: configs/Mele_M3_defconfig
F: configs/Mini-X_defconfig
F: configs/mk802_defconfig
@@ -63,11 +64,6 @@ M: Paul Kocialkowski <contact@paulk.fr>
S: Maintained
F: configs/Ampe_A76_defconfig
-Astar MID756 BOARD
-M: VishnuPatekar <vishnupatekar0510@gmail.com>
-S: Maintained
-F: configs/Astar_MID756_defconfig
-
COLOMBUS BOARD
M: Maxime Ripard <maxime.ripard@free-electrons.com>
S: Maintained
@@ -81,6 +77,11 @@ F: include/configs/sun7i.h
F: configs/Cubieboard2_defconfig
F: configs/Cubietruck_defconfig
+ET Q8 V1.6 Tablet BOARD
+M: VishnuPatekar <vishnupatekar0510@gmail.com>
+S: Maintained
+F: configs/Et_q8_v1_6_defconfig
+
FORFUN-Q88DB TABLET
M: Jens Lucius <info@jenslucius.com>
S: Maintained
OpenPOWER on IntegriCloud