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.

11 files changed, 255 insertions, 2 deletions

diff --git a/package/brcmfmac-firmware/Makefile b/package/brcmfmac-firmware/Makefile
index 4fd65ab52..24d14af7a 100644
--- a/package/brcmfmac-firmware/Makefile
+++ b/package/brcmfmac-firmware/Makefile
@@ -5,7 +5,7 @@ include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		brcmfmac-firmware
 PKG_VERSION:=		1.0
-PKG_RELEASE:=		3
+PKG_RELEASE:=		4
 PKG_DESCR:=		firmware for broadcom wireless cards
 PKG_SECTION:=		sys/firmware
 
diff --git a/package/brcmfmac-firmware/src/brcmfmac43456-sdio.bin b/package/brcmfmac-firmware/src/brcmfmac43456-sdio.bin
new file mode 100644
index 000000000..cd91afc31
--- /dev/null
+++ b/package/brcmfmac-firmware/src/brcmfmac43456-sdio.bin
diff --git a/package/brcmfmac-firmware/src/brcmfmac43456-sdio.clm_blob b/package/brcmfmac-firmware/src/brcmfmac43456-sdio.clm_blob
new file mode 100644
index 000000000..36b865265
--- /dev/null
+++ b/package/brcmfmac-firmware/src/brcmfmac43456-sdio.clm_blob
diff --git a/package/brcmfmac-firmware/src/brcmfmac43456-sdio.txt b/package/brcmfmac-firmware/src/brcmfmac43456-sdio.txt
new file mode 100644
index 000000000..0916af537
--- /dev/null
+++ b/package/brcmfmac-firmware/src/brcmfmac43456-sdio.txt
@@ -0,0 +1,99 @@
+#AP6256_NVRAM_V1.1_08252017
+# Cloned from bcm94345wlpagb_p2xx.txt 
+NVRAMRev=$Rev: 498373 $
+sromrev=11
+vendid=0x14e4
+devid=0x43ab
+manfid=0x2d0
+prodid=0x06e4
+macaddr=00:90:4c:c5:12:38
+nocrc=1
+boardtype=0x6e4
+boardrev=0x1304
+xtalfreq=37400
+#boardflags: 5GHz eTR switch by default
+#            2.4GHz eTR switch by default
+#            bit1 for btcoex
+boardflags=0x00480201
+boardflags2=0x40800000
+boardflags3=0x48200100
+#phycal_tempdelta=15
+rxchain=1
+txchain=1
+aa2g=1
+aa5g=1
+tssipos5g=1
+tssipos2g=1
+femctrl=0
+AvVmid_c0=0,157,1,126,1,126,1,126,1,126
+pa2ga0=-164,5427,-623
+pa2ga1=-165,3699,-515
+#pa5ga0=-146,5304,-612,-140,5341,-613,-166,5326,-633,-154,5272,-621
+#pa5ga0=-134,5385,-609,-132,5359,-605,-154,5360,-621,-140,5288,-604
+pa5ga0=-127,5380,-603,-130,5395,-608,-148,5369,-622,-147,5222,-608
+pa5ga1=-161,3544,-499,-166,3543,-497,-169,3569,-497,-171,3598,-498
+itrsw=1
+pdoffset2g40ma0=10
+pdoffset40ma0=0xaaaa
+pdoffset80ma0=0xaaaa
+extpagain5g=2
+extpagain2g=2
+tworangetssi2g=0
+tworangetssi5g=0
+# LTECX flags
+# WCI2
+ltecxmux=0
+ltecxpadnum=0x0504
+ltecxfnsel=0x22
+ltecxgcigpio=0x32
+
+pacalshift5g=0,0,3
+
+maxp2ga0=70
+cckbw202gpo=0x1000
+cckbw20ul2gpo=0x1000
+ofdmlrbw202gpo=0x0033
+dot11agofdmhrbw202gpo=0x2222
+mcsbw202gpo=0x99333322
+
+cckdigfilttype=5
+
+#maxp5ga0=82,82,82,82
+#mcsbw205glpo=0x99555000
+#mcsbw205gmpo=0x99555000
+#mcsbw205ghpo=0x99555000
+#mcsbw405glpo=0x99555000
+#mcsbw405gmpo=0x99555000
+#mcsbw405ghpo=0x99555000
+#mcsbw805glpo=0x99555000
+#mcsbw805gmpo=0x99555000
+#mcsbw805ghpo=0x99555000
+
+maxp5ga0=73,74,73,73     
+mcsbw205glpo=0x8a875444
+mcsbw205gmpo=0x8a875444
+mcsbw205ghpo=0x8a875444
+
+mcsbw405glpo=0xda844333
+mcsbw405gmpo=0xdb844333
+mcsbw405ghpo=0xda844333
+
+mcsbw805glpo=0xdb555444
+mcsbw805gmpo=0xda555444
+mcsbw805ghpo=0xda555444
+
+
+swctrlmap_2g=0x00040004,0x00020002,0x00040004,0x010a02,0x1ff
+swctrlmap_5g=0x00100010,0x00200020,0x00200020,0x010a02,0x2f4
+swctrlmapext_5g=0x00000000,0x00000000,0x00000000,0x000000,0x3
+swctrlmapext_2g=0x00000000,0x00000000,0x00000000,0x000000,0x3
+
+vcodivmode=1
+deadman_to=481500000
+ed_thresh2g=-54
+ed_thresh5g=-54
+eu_edthresh2g=-54
+eu_edthresh5g=-54
+
+
+muxenab=0x10
diff --git a/package/brcmfmac-firmware/src/brcmfmac4356-sdio.bin b/package/brcmfmac-firmware/src/brcmfmac4356-sdio.bin
new file mode 100644
index 000000000..1f6e647a6
--- /dev/null
+++ b/package/brcmfmac-firmware/src/brcmfmac4356-sdio.bin
diff --git a/package/brcmfmac-firmware/src/brcmfmac4356-sdio.clm_blob b/package/brcmfmac-firmware/src/brcmfmac4356-sdio.clm_blob
new file mode 100644
index 000000000..22d43b616
--- /dev/null
+++ b/package/brcmfmac-firmware/src/brcmfmac4356-sdio.clm_blob
diff --git a/package/brcmfmac-firmware/src/brcmfmac4356-sdio.txt b/package/brcmfmac-firmware/src/brcmfmac4356-sdio.txt
new file mode 100644
index 000000000..fca63053f
--- /dev/null
+++ b/package/brcmfmac-firmware/src/brcmfmac4356-sdio.txt
@@ -0,0 +1,126 @@
+# Sample variables file for BCM94356Z NGFF 22x30mm iPA, iLNA board with PCIe for production package
+NVRAMRev=$Rev: 492104 $
+#4356 chip = 4354 A2 chip
+sromrev=11
+boardrev=0x1102
+boardtype=0x073e
+boardflags=0x02400201
+#0x2000 enable 2G spur WAR
+boardflags2=0x00802000
+boardflags3=0x0000000a
+#boardflags3 0x00000100 /* to read swctrlmap from nvram*/
+#define BFL3_5G_SPUR_WAR   0x00080000   /* enable spur WAR in 5G band */
+#define BFL3_AvVim   0x40000000   /* load AvVim from nvram */
+macaddr=00:90:4c:1a:10:01
+ccode=0x5854
+regrev=205
+antswitch=0
+pdgain5g=4
+pdgain2g=4
+tworangetssi2g=0
+tworangetssi5g=0
+paprdis=0
+femctrl=10
+vendid=0x14e4
+devid=0x43ec
+manfid=0x2d0
+#prodid=0x052e
+nocrc=1
+otpimagesize=502
+xtalfreq=37400
+rxgains2gelnagaina0=0
+rxgains2gtrisoa0=7
+rxgains2gtrelnabypa0=0
+rxgains5gelnagaina0=0
+rxgains5gtrisoa0=11
+rxgains5gtrelnabypa0=0
+rxgains5gmelnagaina0=0
+rxgains5gmtrisoa0=13
+rxgains5gmtrelnabypa0=0
+rxgains5ghelnagaina0=0
+rxgains5ghtrisoa0=12
+rxgains5ghtrelnabypa0=0
+rxgains2gelnagaina1=0
+rxgains2gtrisoa1=7
+rxgains2gtrelnabypa1=0
+rxgains5gelnagaina1=0
+rxgains5gtrisoa1=10
+rxgains5gtrelnabypa1=0
+rxgains5gmelnagaina1=0
+rxgains5gmtrisoa1=11
+rxgains5gmtrelnabypa1=0
+rxgains5ghelnagaina1=0
+rxgains5ghtrisoa1=11
+rxgains5ghtrelnabypa1=0
+rxchain=3
+txchain=3
+aa2g=3
+aa5g=3
+agbg0=2
+agbg1=2
+aga0=2
+aga1=2
+tssipos2g=1
+extpagain2g=2
+tssipos5g=1
+extpagain5g=2
+tempthresh=255
+tempoffset=255
+rawtempsense=0x1ff
+pa2ga0=-147,6192,-705
+pa2ga1=-161,6041,-701
+pa5ga0=-194,6069,-739,-188,6137,-743,-185,5931,-725,-171,5898,-715
+pa5ga1=-190,6248,-757,-190,6275,-759,-190,6225,-757,-184,6131,-746
+subband5gver=0x4
+pdoffsetcckma0=0x4
+pdoffsetcckma1=0x4
+pdoffset40ma0=0x0000
+pdoffset80ma0=0x0000
+pdoffset40ma1=0x0000
+pdoffset80ma1=0x0000
+maxp2ga0=76
+maxp5ga0=74,74,74,74
+maxp2ga1=76
+maxp5ga1=74,74,74,74
+cckbw202gpo=0x0000
+cckbw20ul2gpo=0x0000
+mcsbw202gpo=0x99644422
+mcsbw402gpo=0x99644422
+dot11agofdmhrbw202gpo=0x6666
+ofdmlrbw202gpo=0x0022
+mcsbw205glpo=0x88766663
+mcsbw405glpo=0x88666663
+mcsbw805glpo=0xbb666665
+mcsbw205gmpo=0xd8666663
+mcsbw405gmpo=0x88666663
+mcsbw805gmpo=0xcc666665
+mcsbw205ghpo=0xdc666663
+mcsbw405ghpo=0xaa666663
+mcsbw805ghpo=0xdd666665
+mcslr5glpo=0x0000
+mcslr5gmpo=0x0000
+mcslr5ghpo=0x0000
+sb20in40hrpo=0x0
+sb20in80and160hr5glpo=0x0
+sb40and80hr5glpo=0x0
+sb20in80and160hr5gmpo=0x0
+sb40and80hr5gmpo=0x0
+sb20in80and160hr5ghpo=0x0
+sb40and80hr5ghpo=0x0
+sb20in40lrpo=0x0
+sb20in80and160lr5glpo=0x0
+sb40and80lr5glpo=0x0
+sb20in80and160lr5gmpo=0x0
+sb40and80lr5gmpo=0x0
+sb20in80and160lr5ghpo=0x0
+sb40and80lr5ghpo=0x0
+dot11agduphrpo=0x0
+dot11agduplrpo=0x0
+phycal_tempdelta=255
+temps_period=15
+temps_hysteresis=15
+rssicorrnorm_c0=4,4
+rssicorrnorm_c1=4,4
+rssicorrnorm5g_c0=1,2,3,1,2,3,6,6,8,6,6,8
+rssicorrnorm5g_c1=1,2,3,2,2,2,7,7,8,7,7,8
+
diff --git a/package/u-boot/Makefile b/package/u-boot/Makefile
index 0671a3fa3..45991de05 100644
--- a/package/u-boot/Makefile
+++ b/package/u-boot/Makefile
@@ -59,7 +59,7 @@ ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI3P_64),y)
 CONFIG:=		rpi_3_defconfig
 endif
 ifeq ($(ADK_TARGET_SYSTEM_ROCKPI4_PLUS),y)
-CONFIG:=		rock-pi-4c-rk3399_defconfig
+CONFIG:=		rock-pi-4-rk3399_defconfig
 UBOOT:=			u-boot.itb
 endif
 ifeq ($(ADK_TARGET_SYSTEM_BANANA_PRO),y)
@@ -141,6 +141,9 @@ endif
 ifeq ($(ADK_TARGET_SYSTEM_BANANA_P2_ZERO),y)
 	$(INSTALL_BIN) ./files/boot.script.bpizero $(FW_DIR)
 endif
+ifeq ($(ADK_TARGET_SYSTEM_ROCKPI4_PLUS),y)
+	$(INSTALL_BIN) ./files/boot.script.rockpi4 $(FW_DIR)
+endif
 ifeq ($(ADK_TARGET_SYSTEM_ORANGE_PI0),y)
 	$(INSTALL_BIN) ./files/boot.script.opi $(FW_DIR)
 endif
diff --git a/package/u-boot/files/boot.script.rockpi4 b/package/u-boot/files/boot.script.rockpi4
new file mode 100644
index 000000000..1aca0bddb
--- /dev/null
+++ b/package/u-boot/files/boot.script.rockpi4
@@ -0,0 +1,4 @@
+setenv bootargs console=ttyS2,115200 root=/dev/mmcblk0p1 rootwait
+ext4load mmc 1:1 $kernel_addr_r boot/kernel
+ext4load mmc 1:1 $fdt_addr_r boot/rk3399-rock-pi-4b.dtb
+booti $kernel_addr_r - $fdt_addr_r
diff --git a/package/u-boot/patches/patch-configs_rock-pi-4-rk3399_defconfig b/package/u-boot/patches/patch-configs_rock-pi-4-rk3399_defconfig
new file mode 100644
index 000000000..575ddfbe6
--- /dev/null
+++ b/package/u-boot/patches/patch-configs_rock-pi-4-rk3399_defconfig
@@ -0,0 +1,21 @@
+--- u-boot-2022.10.orig/configs/rock-pi-4-rk3399_defconfig	2022-10-03 21:25:32.000000000 +0200
++++ u-boot-2022.10/configs/rock-pi-4-rk3399_defconfig	2022-12-25 06:25:34.169217143 +0100
+@@ -4,7 +4,8 @@ CONFIG_COUNTER_FREQUENCY=24000000
+ CONFIG_ARCH_ROCKCHIP=y
+ CONFIG_SYS_TEXT_BASE=0x00200000
+ CONFIG_NR_DRAM_BANKS=1
+-CONFIG_ENV_OFFSET=0x3F8000
++CONFIG_ENV_OFFSET=-0x20000
++CONFIG_ENV_SIZE=0x20000
+ CONFIG_DEFAULT_DEVICE_TREE="rk3399-rock-pi-4b"
+ CONFIG_ROCKCHIP_RK3399=y
+ CONFIG_TARGET_EVB_RK3399=y
+@@ -60,7 +61,7 @@ CONFIG_REGULATOR_RK8XX=y
+ CONFIG_PWM_ROCKCHIP=y
+ CONFIG_RAM_RK3399_LPDDR4=y
+ CONFIG_DM_RESET=y
+-CONFIG_BAUDRATE=1500000
++CONFIG_BAUDRATE=115200
+ CONFIG_DEBUG_UART_SHIFT=2
+ CONFIG_SYSRESET=y
+ CONFIG_USB=y
diff --git a/package/u-boot/src/bl31.elf b/package/u-boot/src/bl31.elf
new file mode 100644
index 000000000..24cb666c7
--- /dev/null
+++ b/package/u-boot/src/bl31.elf