Nanako/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

uboot-rockchip: remove redudant NanoPi R4S Enterprise Edition build

Browse Source 
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen
2024-01-10 19:33:38 +08:00
parent 3692daa57c
commit b8ba5564d7
6 changed files with 6 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
package/boot/uboot-rockchip/Makefile
View File

@@ -115,7 +115,8 @@ define U-Boot/nanopi-r4s-rk3399
$(U-Boot/Default/rk3399)
NAME:=NanoPi R4S
BUILD_DEVICES:= \
friendlyarm_nanopi-r4s
friendlyarm_nanopi-r4s \
friendlyarm_nanopi-r4s-enterprise
endef
define U-Boot/nanopi-r4se-rk3399
@@ -125,13 +126,6 @@ define U-Boot/nanopi-r4se-rk3399
friendlyarm_nanopi-r4se
endef
define U-Boot/nanopi-r4s-enterprise-rk3399
$(U-Boot/Default/rk3399)
NAME:=NanoPi R4S Enterprise Edition
BUILD_DEVICES:= \
friendlyarm_nanopi-r4s-enterprise
endef
define U-Boot/rock-pi-4-rk3399
$(U-Boot/Default/rk3399)
NAME:=Rock Pi 4
@@ -250,7 +244,6 @@ UBOOT_TARGETS := \
nanopc-t4-rk3399 \
nanopi-r4s-rk3399 \
nanopi-r4se-rk3399 \
nanopi-r4s-enterprise-rk3399 \
rock-pi-4-rk3399 \
rockpro64-rk3399 \
nanopi-r2c-rk3328 \

7
package/boot/uboot-rockchip/patches/900-arm-add-dts-files.patch
View File

@@ -16,16 +16,15 @@
rk3399-khadas-edge.dtb \
rk3399-khadas-edge-captain.dtb \
rk3399-khadas-edge-v.dtb \
@@ -156,6 +158,8 @@ dtb-$(CONFIG_ROCKCHIP_RK3399) += \
@@ -156,6 +158,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3399) += \
rk3399-nanopi-m4b.dtb \
rk3399-nanopi-neo4.dtb \
rk3399-nanopi-r4s.dtb \
+ rk3399-nanopi-r4se.dtb \
+ rk3399-nanopi-r4s-enterprise.dtb \
rk3399-orangepi.dtb \
rk3399-pinebook-pro.dtb \
rk3399-pinephone-pro.dtb \
@@ -180,11 +184,15 @@ dtb-$(CONFIG_ROCKCHIP_RK3568) += \
@@ -180,11 +183,15 @@ dtb-$(CONFIG_ROCKCHIP_RK3568) += \
rk3566-soquartz-model-a.dtb \
rk3568-bpi-r2-pro.dtb \
rk3568-evb.dtb \
@@ -41,7 +40,7 @@
rk3568-rock-3a.dtb
dtb-$(CONFIG_ROCKCHIP_RK3588) += \
@@ -196,7 +204,9 @@ dtb-$(CONFIG_ROCKCHIP_RK3588) += \
@@ -196,7 +203,9 @@ dtb-$(CONFIG_ROCKCHIP_RK3588) += \
rk3588-orangepi-5-plus.dtb \
rk3588-quartzpro64.dtb \
rk3588s-rock-5a.dtb \

17
package/boot/uboot-rockchip/src/arch/arm/dts/rk3399-nanopi-r4s-enterprise-u-boot.dtsi
View File

@@ -1,17 +0,0 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
#include "rk3399-nanopi-r4s-u-boot.dtsi"
/ {
smbios {
smbios {
system {
product = "NanoPi R4S Enterprise Edition";
};
baseboard {
product = "NanoPi R4S Enterprise Edition";
};
};
};
};

29
package/boot/uboot-rockchip/src/arch/arm/dts/rk3399-nanopi-r4s-enterprise.dts
View File

@@ -1,29 +0,0 @@
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
/dts-v1/;
#include "rk3399-nanopi-r4s.dts"
/ {
model = "FriendlyElec NanoPi R4S Enterprise Edition";
compatible = "friendlyarm,nanopi-r4s-enterprise", "rockchip,rk3399";
};
&gmac {
nvmem-cells = <&mac_address>;
nvmem-cell-names = "mac-address";
};
&i2c2 {
eeprom@51 {
compatible = "microchip,24c02", "atmel,24c02";
reg = <0x51>;
pagesize = <16>;
size = <256>;
#address-cells = <1>;
#size-cells = <1>;
mac_address: mac-address@fa {
reg = <0xfa 0x06>;
};
};
};

82
package/boot/uboot-rockchip/src/configs/nanopi-r4s-enterprise-rk3399_defconfig
View File

@@ -1,82 +0,0 @@
CONFIG_ARM=y
CONFIG_SKIP_LOWLEVEL_INIT=y
CONFIG_COUNTER_FREQUENCY=24000000
CONFIG_ARCH_ROCKCHIP=y
CONFIG_TEXT_BASE=0x00200000
CONFIG_NR_DRAM_BANKS=1
CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x300000
CONFIG_ENV_OFFSET=0x3F8000
CONFIG_DEFAULT_DEVICE_TREE="rk3399-nanopi-r4s-enterprise"
CONFIG_ROCKCHIP_RK3399=y
CONFIG_TARGET_EVB_RK3399=y
CONFIG_SPL_STACK=0x400000
CONFIG_DEBUG_UART_BASE=0xFF1A0000
CONFIG_DEBUG_UART_CLOCK=24000000
CONFIG_SYS_LOAD_ADDR=0x800800
CONFIG_DEBUG_UART=y
CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-nanopi-r4s-enterprise.dtb"
CONFIG_DISPLAY_BOARDINFO_LATE=y
CONFIG_MISC_INIT_R=y
CONFIG_SPL_MAX_SIZE=0x2e000
CONFIG_SPL_PAD_TO=0x7f8000
CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
CONFIG_SPL_BSS_START_ADDR=0x400000
CONFIG_SPL_BSS_MAX_SIZE=0x2000
# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
CONFIG_SPL_STACK_R=y
CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x10000
CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y
CONFIG_TPL=y
CONFIG_CMD_BOOTZ=y
CONFIG_CMD_GPT=y
CONFIG_CMD_MMC=y
CONFIG_CMD_USB=y
# CONFIG_CMD_SETEXPR is not set
CONFIG_CMD_TIME=y
CONFIG_SPL_OF_CONTROL=y
CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
CONFIG_ENV_IS_IN_MMC=y
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
CONFIG_ROCKCHIP_GPIO=y
CONFIG_SYS_I2C_ROCKCHIP=y
CONFIG_MISC=y
CONFIG_ROCKCHIP_EFUSE=y
CONFIG_ROCKCHIP_OTP=y
CONFIG_MMC_DW=y
CONFIG_MMC_DW_ROCKCHIP=y
CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_ROCKCHIP=y
CONFIG_ETH_DESIGNWARE=y
CONFIG_GMAC_ROCKCHIP=y
CONFIG_PMIC_RK8XX=y
CONFIG_REGULATOR_PWM=y
CONFIG_REGULATOR_RK8XX=y
CONFIG_PWM_ROCKCHIP=y
CONFIG_RAM_ROCKCHIP_LPDDR4=y
CONFIG_BAUDRATE=1500000
CONFIG_DEBUG_UART_SHIFT=2
CONFIG_SYS_NS16550_MEM32=y
CONFIG_SYSINFO=y
CONFIG_SYSINFO_SMBIOS=y
CONFIG_SYSRESET=y
CONFIG_USB=y
CONFIG_USB_XHCI_HCD=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_GENERIC=y
CONFIG_USB_DWC3=y
CONFIG_USB_DWC3_GENERIC=y
CONFIG_USB_KEYBOARD=y
CONFIG_USB_HOST_ETHER=y
CONFIG_USB_ETHER_ASIX=y
CONFIG_USB_ETHER_ASIX88179=y
CONFIG_USB_ETHER_MCS7830=y
CONFIG_USB_ETHER_RTL8152=y
CONFIG_USB_ETHER_SMSC95XX=y
CONFIG_VIDEO=y
CONFIG_DISPLAY=y
CONFIG_VIDEO_ROCKCHIP=y
CONFIG_DISPLAY_ROCKCHIP_HDMI=y
CONFIG_SPL_TINY_MEMSET=y
CONFIG_ERRNO_STR=y

2
target/linux/rockchip/image/armv8.mk
View File

@@ -112,6 +112,7 @@ define Device/friendlyarm_nanopi-r4s-enterprise
DEVICE_VENDOR := FriendlyARM
DEVICE_MODEL := NanoPi R4S Enterprise Edition
SOC := rk3399
UBOOT_DEVICE_NAME := nanopi-r4s-rk3399
BOOT_FLOW := pine64-bin
DEVICE_PACKAGES := kmod-r8168
endef
@@ -166,7 +167,6 @@ define Device/lunzn_fastrhino-r66s
DEVICE_VENDOR := Lunzn
DEVICE_MODEL := FastRhino R66S
SOC := rk3568
UBOOT_DEVICE_NAME := fastrhino-r66s-rk3568
BOOT_FLOW := pine64-img
DEVICE_PACKAGES := kmod-r8125
endef