use rockpi4 b plus dtb instead of c, fixes bootup.

A lot of drivers where moved from mini.config to target/linux/config.
WLAN works, ethernet works, i2c works, RTC works.

10 files changed, 129 insertions, 4 deletions

diff --git a/target/linux/config/Config.in.audio b/target/linux/config/Config.in.audio
index 6084ebfed..401b84af1 100644
--- a/target/linux/config/Config.in.audio
+++ b/target/linux/config/Config.in.audio
@@ -140,6 +140,14 @@ config ADK_LINUX_KERNEL_SND_INTEL8X0
 	help
 	  Driver for intel chipsets.
 
+config ADK_LINUX_KERNEL_SND_ROCKCHIP
+	tristate "Rockchip driver"
+	select ADK_LINUX_KERNEL_SND
+	default m if ADK_TARGET_SYSTEM_ROCKPI4_PLUS
+	default n
+	help
+	  ALSA Rockchip driver
+	
 config ADK_LINUX_KERNEL_SND_VIA82XX
 	tristate "VIA82XX driver"
 	select ADK_LINUX_KERNEL_SND
diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block
index c8078394a..b07ece645 100644
--- a/target/linux/config/Config.in.block
+++ b/target/linux/config/Config.in.block
@@ -157,6 +157,12 @@ config ADK_LINUX_KERNEL_MMC_BCM2835_DMA
 config ADK_LINUX_KERNEL_MMC_BCM2835_SDHOST
 	bool
 
+config ADK_LINUX_KERNEL_MMC_DW
+	bool
+
+config ADK_LINUX_KERNEL_MMC_DW_PLTFM
+	bool
+
 config ADK_LINUX_KERNEL_PWRSEQ_EMMC
 	bool
 
@@ -546,6 +552,30 @@ config ADK_LINUX_KERNEL_MMC_ATMELMCI
 	  Atmel Multimedia Card Interface driver for AT32
 	  and AT91 plattforms.
 
+config ADK_LINUX_KERNEL_MMC_DW_ROCKCHIP
+	bool "SD/MMC Driver (Rockchip)"
+	select ADK_LINUX_KERNEL_BLOCK
+	select ADK_LINUX_KERNEL_BLK_DEV
+	select ADK_LINUX_KERNEL_LBDAF
+	select ADK_LINUX_KERNEL_SCSI
+	select ADK_LINUX_KERNEL_SCSI_DMA
+	select ADK_LINUX_KERNEL_SCSI_MULTI_LUN
+	select ADK_LINUX_KERNEL_SCSI_CONSTANTS
+	select ADK_LINUX_KERNEL_SCSI_LOGGING
+	select ADK_LINUX_KERNEL_SCSI_SCAN_ASYNC
+	select ADK_LINUX_KERNEL_MMC
+	select ADK_LINUX_KERNEL_MMC_BLOCK
+	select ADK_LINUX_KERNEL_MMC_BLOCK_BOUNCE
+	select ADK_LINUX_KERNEL_MMC_SDHCI
+	select ADK_LINUX_KERNEL_MMC_SDHCI_IO_ACCESSORS
+	select ADK_LINUX_KERNEL_MMC_SDHCI_PLTFM
+	select ADK_LINUX_KERNEL_MMC_DW
+	select ADK_LINUX_KERNEL_MMC_DW_PLTFM
+	default y if ADK_TARGET_SYSTEM_ROCKPI4_PLUS
+	default n
+	help
+	  RockPI 4 Plus driver for MMC
+
 endmenu
 
 menu "Block driver support"
diff --git a/target/linux/config/Config.in.cpu b/target/linux/config/Config.in.cpu
index 8a78d7572..5effd7bfd 100644
--- a/target/linux/config/Config.in.cpu
+++ b/target/linux/config/Config.in.cpu
@@ -50,8 +50,10 @@ config ADK_LINUX_KERNEL_CPUFREQ_DT
 	bool "CPU frequency support DT"
 	select ADK_LINUX_KERNEL_CPU_FREQ
 	select ADK_LINUX_KERNEL_CPUFREQ_DT_PLATDEV
-	depends on ADK_TARGET_SYSTEM_ORANGE_PI0
+	depends on ADK_TARGET_SYSTEM_ORANGE_PI0 || \
+		ADK_TARGET_SYSTEM_ROCKPI4_PLUS
 	default y if ADK_TARGET_SYSTEM_ORANGE_PI0
+	default y if ADK_TARGET_SYSTEM_ROCKPI4_PLUS
 	default n
 
 config ADK_LINUX_KERNEL_ARM_IMX6Q_CPUFREQ
diff --git a/target/linux/config/Config.in.ethernet b/target/linux/config/Config.in.ethernet
index fbff94d54..4009f4474 100644
--- a/target/linux/config/Config.in.ethernet
+++ b/target/linux/config/Config.in.ethernet
@@ -115,6 +115,9 @@ config ADK_LINUX_KERNEL_DWMAC_GENERIC
 config ADK_LINUX_KERNEL_DWMAC_SUNXI
 	bool
 
+config ADK_LINUX_KERNEL_DWMAC_ROCKCHIP
+	bool
+
 config ADK_LINUX_KERNEL_STMMAC_PLATFORM
 	bool
 
@@ -487,14 +490,17 @@ config ADK_LINUX_KERNEL_STMMAC_ETH
 	select ADK_LINUX_KERNEL_DWMAC_GENERIC if ADK_TARGET_SYSTEM_QEMU_CSKY
 	select ADK_LINUX_KERNEL_DWMAC_GENERIC if ADK_TARGET_SYSTEM_SYNOPSYS_HSDK
 	select ADK_LINUX_KERNEL_MICREL_PHY if ADK_TARGET_SYSTEM_SYNOPSYS_HSDK
+	select ADK_LINUX_KERNEL_DWMAC_ROCKCHIP if ADK_TARGET_SYSTEM_ROCKPI4_PLUS
 	depends on ADK_TARGET_SYSTEM_BANANA_PRO \
 		|| ADK_TARGET_SYSTEM_ORANGE_PI0 \
 		|| ADK_TARGET_SYSTEM_QEMU_CSKY \
-		|| ADK_TARGET_SYSTEM_SYNOPSYS_HSDK
+		|| ADK_TARGET_SYSTEM_SYNOPSYS_HSDK \
+		|| ADK_TARGET_SYSTEM_ROCKPI4_PLUS
 	default y if ADK_TARGET_SYSTEM_BANANA_PRO
 	default y if ADK_TARGET_SYSTEM_ORANGE_PI0
 	default y if ADK_TARGET_SYSTEM_QEMU_CSKY
 	default y if ADK_TARGET_SYSTEM_SYNOPSYS_HSDK
+	default y if ADK_TARGET_SYSTEM_ROCKPI4_PLUS
 	default n
 
 config ADK_LINUX_KERNEL_SUNGEM
diff --git a/target/linux/config/Config.in.i2c b/target/linux/config/Config.in.i2c
index aa3b1d128..2629135b1 100644
--- a/target/linux/config/Config.in.i2c
+++ b/target/linux/config/Config.in.i2c
@@ -28,6 +28,26 @@ config ADK_LINUX_KERNEL_I2C_GPIO
 config ADK_LINUX_KERNEL_I2C_BCM2835
 	tristate
 
+config ADK_LINUX_KERNEL_I2C_DESIGNWARE_CORE
+	tristate
+
+config ADK_LINUX_KERNEL_I2C_DESIGNWARE_PLATFORM
+	tristate
+
+config ADK_LINUX_KERNEL_I2C_RK3X
+	tristate "I2C driver for Rockchip"
+	select ADK_LINUX_KERNEL_I2C
+	select ADK_LINUX_KERNEL_REGMAP
+	select ADK_LINUX_KERNEL_REGMAP_I2C
+	select ADK_LINUX_KERNEL_I2C_CHARDEV
+	select ADK_LINUX_KERNEL_I2C_DESIGNWARE_CORE
+	select ADK_LINUX_KERNEL_I2C_DESIGNWARE_PLATFORM
+	depends on ADK_TARGET_SYSTEM_ROCKPI4_PLUS
+	default y if ADK_TARGET_SYSTEM_ROCKPI4_PLUS
+	default n
+	help
+	  I2C driver for Synopsys DesignWare.
+
 config ADK_LINUX_KERNEL_I2C_BCM2708
 	tristate "I2C driver for BCM28XX boards"
 	select ADK_LINUX_KERNEL_I2C
diff --git a/target/linux/config/Config.in.rtc b/target/linux/config/Config.in.rtc
index db68ff960..cf6bddb9e 100644
--- a/target/linux/config/Config.in.rtc
+++ b/target/linux/config/Config.in.rtc
@@ -52,6 +52,17 @@ config ADK_LINUX_KERNEL_RTC_DRV_AT91SAM9
 	help
  	  Fox G20 RTC support.
 
+config ADK_LINUX_KERNEL_RTC_DRV_RK808
+	bool "RTC support for Rockchip"
+	select ADK_LINUX_KERNEL_RTC_CLASS
+	select ADK_LINUX_KERNEL_RTC_HCTOSYS
+	select ADK_LINUX_KERNEL_RTC_INTF_DEV
+	default y if ADK_TARGET_SYSTEM_ROCKPI4_PLUS
+	default n
+	depends on ADK_TARGET_SYSTEM_ROCKPI4_PLUS
+	help
+	  Rockchip RTC support.
+
 config ADK_LINUX_KERNEL_RTC_DRV_CMOS
 	bool "RTC support for PC CMOS"
 	select ADK_LINUX_KERNEL_RTC_CLASS
diff --git a/target/linux/config/Config.in.serial b/target/linux/config/Config.in.serial
index 41704978a..d9f904184 100644
--- a/target/linux/config/Config.in.serial
+++ b/target/linux/config/Config.in.serial
@@ -102,11 +102,13 @@ config ADK_LINUX_KERNEL_SERIAL_8250
 						|| ADK_TARGET_SYSTEM_ANDES_AG101P \
 						|| ADK_TARGET_SYSTEM_ORANGE_PI0 \
 						|| ADK_TARGET_SYSTEM_SYNOPSYS_HSDK \
-						|| ADK_TARGET_SYSTEM_SOM_C6745
+						|| ADK_TARGET_SYSTEM_SOM_C6745 \
+						|| ADK_TARGET_SYSTEM_ROCKPI4_PLUS
 	select ADK_LINUX_KERNEL_SERIAL_8250_PNP if ADK_TARGET_SYSTEM_PCENGINES_APU
 	select ADK_LINUX_KERNEL_SERIAL_8250_DW if ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG
 	select ADK_LINUX_KERNEL_SERIAL_8250_DW if ADK_TARGET_SYSTEM_ORANGE_PI0
 	select ADK_LINUX_KERNEL_SERIAL_8250_DW if ADK_TARGET_SYSTEM_SYNOPSYS_HSDK
+	select ADK_LINUX_KERNEL_SERIAL_8250_DW if ADK_TARGET_SYSTEM_ROCKPI4_PLUS
 	select ADK_LINUX_KERNEL_SERIAL_8250_DMA if ADK_TARGET_SYSTEM_ORANGE_PI0
 	select ADK_LINUX_KERNEL_SERIAL_8250_INGENIC if ADK_TARGET_SYSTEM_IMGTEC_CI20
 	depends on ADK_TARGET_SYSTEM_XILINX_KINTEX7 \
@@ -138,7 +140,8 @@ config ADK_LINUX_KERNEL_SERIAL_8250
 		|| ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG \
 		|| ADK_TARGET_SYSTEM_ORANGE_PI0 \
 		|| ADK_TARGET_SYSTEM_SYNOPSYS_HSDK \
-		|| ADK_TARGET_SYSTEM_SOM_C6745
+		|| ADK_TARGET_SYSTEM_SOM_C6745 \
+		|| ADK_TARGET_SYSTEM_ROCKPI4_PLUS
 	default y if ADK_TARGET_SYSTEM_XILINX_KINTEX7
 	default y if ADK_TARGET_SYSTEM_IMGTEC_CI20
 	default y if ADK_TARGET_SYSTEM_LINKSYS_NSLU2
@@ -169,6 +172,7 @@ config ADK_LINUX_KERNEL_SERIAL_8250
 	default y if ADK_TARGET_SYSTEM_ORANGE_PI0
 	default y if ADK_TARGET_SYSTEM_SYNOPSYS_HSDK
 	default y if ADK_TARGET_SYSTEM_SOM_C6745
+	default y if ADK_TARGET_SYSTEM_ROCKPI4_PLUS
 	default n
 	help
 	  Serial driver for 8250 UART chip.
diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb
index bd50dd446..9717a6231 100644
--- a/target/linux/config/Config.in.usb
+++ b/target/linux/config/Config.in.usb
@@ -25,6 +25,9 @@ config ADK_LINUX_KERNEL_USB_EHCI_TT_NEWSCHED
 config ADK_LINUX_KERNEL_USB_EHCI_MXC
 	bool
 
+config ADK_LINUX_KERNEL_USB_EHCI_HCD_PLATFORM
+	bool
+
 config ADK_LINUX_KERNEL_USB_GADGET
 	tristate
 
@@ -38,6 +41,9 @@ config ADK_LINUX_KERNEL_USB_MXS_PHY
 		ADK_TARGET_SYSTEM_PHYTEC_IMX6
 	default n
 
+config ADK_LINUX_KERNEL_USB_XHCI_PLATFORM
+	bool
+
 config ADK_LINUX_KERNEL_USB_OHCI_HCD_PLATFORM
 	bool
 	select ADK_LINUX_KERNEL_USB_OHCI_HCD
@@ -45,6 +51,12 @@ config ADK_LINUX_KERNEL_USB_OHCI_HCD_PLATFORM
 config ADK_LINUX_KERNEL_USB_OHCI_HCD_PCI
 	bool
 
+config ADK_LINUX_KERNEL_USB_EHCI_HCD_PCI
+	bool
+
+config ADK_LINUX_KERNEL_USB_XHCI_HCD_PCI
+	bool
+
 config ADK_LINUX_KERNEL_USB_LIBUSUAL
 	tristate
 
@@ -68,6 +80,7 @@ config ADK_LINUX_KERNEL_USB
 		ADK_TARGET_SYSTEM_PHYTEC_IMX6
 	default y if ADK_TARGET_SYSTEM_KINETIS_K70
 	default y if ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG
+	default y if ADK_TARGET_SYSTEM_ROCKPI4_PLUS
 	default n
 	help
 	  Universal Serial Bus (USB) is a specification for a serial bus
@@ -100,12 +113,29 @@ config ADK_LINUX_KERNEL_USB
 
 menu "USB controller support"
 
+config ADK_LINUX_KERNEL_USB_XHCI_HCD
+	tristate "Support for USB xHCI HCD (USB 3.0)"
+	depends on ADK_LINUX_KERNEL_USB
+	select ADK_LINUX_KERNEL_USB_XHCI_HCD_PLATFORM if ADK_TARGET_SYSTEM_ROCKPI4_PLUS
+	select ADK_LINUX_KERNEL_USB_XHCI_HCD_PCI if ADK_TARGET_SYSTEM_ROCKPI4_PLUS
+	default y if ADK_TARGET_SYSTEM_ROCKPI4_PLUS
+	default n
+	help
+          The eXtensible Host Controller Interface (xHCI) is standard for USB 3.0
+          "SuperSpeed" host controller hardware.
+
+          To compile this driver as a module, choose M here: the
+          module will be called xhci-hcd.
+
+
 config ADK_LINUX_KERNEL_USB_EHCI_HCD
 	tristate "Support for USB EHCI 2.0 controllers"
 	select ADK_LINUX_KERNEL_USB_MXS_PHY if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6  || \
 		ADK_TARGET_SYSTEM_PHYTEC_IMX6
 	select ADK_LINUX_KERNEL_USB_EHCI_MXC if ADK_TARGET_SYSTEM_KINETIS_K70
 	select ADK_LINUX_KERNEL_USB_DEVICE_CLASS if ADK_TARGET_SYSTEM_KINETIS_K70
+	select ADK_LINUX_KERNEL_USB_EHCI_HCD_PLATFORM if ADK_TARGET_SYSTEM_ROCKPI4_PLUS
+	select ADK_LINUX_KERNEL_USB_EHCI_HCD_PCI if ADK_TARGET_SYSTEM_ROCKPI4_PLUS
 	depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
 	depends on !ADK_TARGET_BOARD_BCM28XX
 	depends on ADK_LINUX_KERNEL_USB
@@ -116,6 +146,7 @@ config ADK_LINUX_KERNEL_USB_EHCI_HCD
 		ADK_TARGET_SYSTEM_PHYTEC_IMX6
 	default y if ADK_TARGET_SYSTEM_KINETIS_K70
 	default y if ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG
+	default y if ADK_TARGET_SYSTEM_ROCKPI4_PLUS
 	default n
 	help
 	  The Enhanced Host Controller Interface (EHCI) is standard for USB 2.0
@@ -161,10 +192,12 @@ config ADK_LINUX_KERNEL_USB_OHCI_HCD
 	depends on !ADK_TARGET_BOARD_BCM28XX
 	select ADK_LINUX_KERNEL_USB_OHCI_HCD_PCI if ADK_TARGET_SYSTEM_PCENGINES_ALIX
 	select ADK_LINUX_KERNEL_USB_OHCI_HCD_PCI if ADK_TARGET_SYSTEM_PCENGINES_APU
+	select ADK_LINUX_KERNEL_USB_OHCI_HCD_PCI if ADK_TARGET_SYSTEM_ROCKPI4_PLUS
 	default m if ADK_TARGET_SYSTEM_PCENGINES_APU
 	default m if ADK_TARGET_SYSTEM_PCENGINES_ALIX
 	default m if ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
 	default m if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
+	default y if ADK_TARGET_SYSTEM_ROCKPI4_PLUS
 	default n
 	help
 	  The Open Host Controller Interface (OHCI) is a standard for accessing
diff --git a/target/linux/config/Config.in.watchdog b/target/linux/config/Config.in.watchdog
index 3175180cf..59c60d94f 100644
--- a/target/linux/config/Config.in.watchdog
+++ b/target/linux/config/Config.in.watchdog
@@ -94,6 +94,15 @@ config ADK_LINUX_KERNEL_SUNXI_WATCHDOG
 	help
 	  Support for SunXi hardware watchdog.
 
+config ADK_LINUX_KERNEL_DW_WATCHDOG
+	bool "Synopsys DesignWare watchdog"
+	depends on ADK_TARGET_SYSTEM_ROCKPI4_PLUS
+	select ADK_LINUX_KERNEL_WATCHDOG
+	default y if ADK_TARGET_SYSTEM_ROCKPI4_PLUS
+	default n
+	help
+	  Support for Synopsys DesignWare hardware watchdog.
+
 config ADK_LINUX_KERNEL_SOFT_WATCHDOG
 	tristate "Software watchdog"
 	select ADK_LINUX_KERNEL_WATCHDOG
diff --git a/target/linux/config/Config.in.wireless b/target/linux/config/Config.in.wireless
index 3649bae8b..01ed051dd 100644
--- a/target/linux/config/Config.in.wireless
+++ b/target/linux/config/Config.in.wireless
@@ -150,6 +150,7 @@ config ADK_LINUX_KERNEL_BRCMFMAC
 	select ADK_LINUX_KERNEL_BRCMDBG
 	select ADK_PACKAGE_BRCMFMAC_FIRMWARE
 	default m if ADK_TARGET_SYSTEM_BANANA_P2_ZERO
+	default m if ADK_TARGET_SYSTEM_ROCKPI4_ZERO
 	default n
 
 config ADK_LINUX_KERNEL_BRCMFMAC_SDIO
@@ -160,6 +161,7 @@ config ADK_LINUX_KERNEL_BRCMFMAC_SDIO
 	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI0
 	default y if ADK_TARGET_SYSTEM_RASPBERRY_PI3
 	default y if ADK_TARGET_SYSTEM_BANANA_P2_ZERO
+	default y if ADK_TARGET_SYSTEM_ROCKPI4_PLUS
 	default n
 	help
 	  Driver for Broadcom FullMac wireless cards (SDIO).