Skip to content

Commit 9ba0740

Browse files
committed
revert uboot to fix #36
1 parent a58b152 commit 9ba0740

23 files changed

Lines changed: 1850 additions & 10 deletions
Lines changed: 109 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,109 @@
1+
#
2+
# This is free software, licensed under the GNU General Public License v2.
3+
# See /LICENSE for more information.
4+
#
5+
include $(TOPDIR)/rules.mk
6+
include $(INCLUDE_DIR)/kernel.mk
7+
8+
PKG_VERSION:=2022.07
9+
PKG_RELEASE:=$(AUTORELEASE)
10+
11+
PKG_HASH:=92b08eb49c24da14c1adbf70a71ae8f37cc53eeb4230e859ad8b6733d13dcf5e
12+
13+
PKG_MAINTAINER:=Tobias Maedel <openwrt@tbspace.de>
14+
15+
include $(INCLUDE_DIR)/u-boot.mk
16+
include $(INCLUDE_DIR)/package.mk
17+
18+
define U-Boot/Default
19+
BUILD_TARGET:=rockchip
20+
UENV:=default
21+
HIDDEN:=1
22+
endef
23+
24+
25+
# RK3328 boards
26+
27+
define U-Boot/nanopi-r2c-rk3328
28+
BUILD_SUBTARGET:=armv8
29+
NAME:=NanoPi R2C
30+
BUILD_DEVICES:= \
31+
friendlyarm_nanopi-r2c
32+
DEPENDS:=+PACKAGE_u-boot-nanopi-r2c-rk3328:arm-trusted-firmware-rockchip
33+
PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip
34+
ATF:=rk3328_bl31.elf
35+
endef
36+
37+
define U-Boot/nanopi-r2s-rk3328
38+
BUILD_SUBTARGET:=armv8
39+
NAME:=NanoPi R2S
40+
BUILD_DEVICES:= \
41+
friendlyarm_nanopi-r2s
42+
DEPENDS:=+PACKAGE_u-boot-nanopi-r2s-rk3328:arm-trusted-firmware-rockchip
43+
PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip
44+
ATF:=rk3328_bl31.elf
45+
endef
46+
47+
48+
# RK3399 boards
49+
50+
define U-Boot/nanopi-r4s-rk3399
51+
BUILD_SUBTARGET:=armv8
52+
NAME:=NanoPi R4S
53+
BUILD_DEVICES:= \
54+
friendlyarm_nanopi-r4s
55+
DEPENDS:=+PACKAGE_u-boot-nanopi-r4s-rk3399:arm-trusted-firmware-rockchip
56+
PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip
57+
ATF:=rk3399_bl31.elf
58+
endef
59+
60+
define U-Boot/rock-pi-4-rk3399
61+
BUILD_SUBTARGET:=armv8
62+
NAME:=Rock Pi 4
63+
BUILD_DEVICES:= \
64+
radxa_rock-pi-4a
65+
DEPENDS:=+PACKAGE_u-boot-rock-pi-4-rk3399:arm-trusted-firmware-rockchip
66+
PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip
67+
ATF:=rk3399_bl31.elf
68+
endef
69+
70+
define U-Boot/rockpro64-rk3399
71+
BUILD_SUBTARGET:=armv8
72+
NAME:=RockPro64
73+
BUILD_DEVICES:= \
74+
pine64_rockpro64
75+
DEPENDS:=+PACKAGE_u-boot-rockpro64-rk3399:arm-trusted-firmware-rockchip
76+
PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip
77+
ATF:=rk3399_bl31.elf
78+
endef
79+
80+
UBOOT_TARGETS := \
81+
nanopi-r4s-rk3399 \
82+
rock-pi-4-rk3399 \
83+
rockpro64-rk3399 \
84+
nanopi-r2c-rk3328 \
85+
nanopi-r2s-rk3328
86+
87+
UBOOT_CONFIGURE_VARS += USE_PRIVATE_LIBGCC=yes
88+
89+
UBOOT_MAKE_FLAGS += \
90+
BL31=$(STAGING_DIR_IMAGE)/$(ATF)
91+
92+
define Build/Configure
93+
$(call Build/Configure/U-Boot)
94+
95+
$(SED) 's/CONFIG_TOOLS_LIBCRYPTO=y/# CONFIG_TOOLS_LIBCRYPTO is not set/' $(PKG_BUILD_DIR)/.config
96+
$(SED) 's#CONFIG_MKIMAGE_DTC_PATH=.*#CONFIG_MKIMAGE_DTC_PATH="$(PKG_BUILD_DIR)/scripts/dtc/dtc"#g' $(PKG_BUILD_DIR)/.config
97+
echo 'CONFIG_IDENT_STRING=" OpenWrt"' >> $(PKG_BUILD_DIR)/.config
98+
endef
99+
100+
define Build/InstallDev
101+
$(INSTALL_DIR) $(STAGING_DIR_IMAGE)
102+
$(CP) $(PKG_BUILD_DIR)/idbloader.img $(STAGING_DIR_IMAGE)/$(BUILD_VARIANT)-idbloader.img
103+
$(CP) $(PKG_BUILD_DIR)/u-boot.itb $(STAGING_DIR_IMAGE)/$(BUILD_VARIANT)-u-boot.itb
104+
endef
105+
106+
define Package/u-boot/install/default
107+
endef
108+
109+
$(eval $(call BuildPackage/U-Boot))

openwrt-22.03/patches/package/uboot-rockchip/patches/003-Revert-Makefile-Only-build-dtc-if-needed.patch renamed to openwrt-22.03/patches/package/uboot-rockchip-202207/patches/003-Revert-Makefile-Only-build-dtc-if-needed.patch

File renamed without changes.

openwrt-22.03/patches/package/uboot-rockchip/patches/004-no-kwbimage.patch renamed to openwrt-22.03/patches/package/uboot-rockchip-202207/patches/004-no-kwbimage.patch

File renamed without changes.

openwrt-22.03/patches/package/uboot-rockchip/patches/005-fix-mkimage-host-build.patch renamed to openwrt-22.03/patches/package/uboot-rockchip-202207/patches/005-fix-mkimage-host-build.patch

File renamed without changes.
Lines changed: 176 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,176 @@
1+
--- a/arch/arm/dts/Makefile
2+
+++ b/arch/arm/dts/Makefile
3+
@@ -124,6 +124,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3308) += \
4+
5+
dtb-$(CONFIG_ROCKCHIP_RK3328) += \
6+
rk3328-evb.dtb \
7+
+ rk3328-nanopi-r2c.dtb \
8+
rk3328-nanopi-r2s.dtb \
9+
rk3328-orangepi-r1-plus.dtb \
10+
rk3328-roc-cc.dtb \
11+
--- /dev/null
12+
+++ b/arch/arm/dts/rk3328-nanopi-r2c-u-boot.dtsi
13+
@@ -0,0 +1,7 @@
14+
+// SPDX-License-Identifier: GPL-2.0+
15+
+/*
16+
+ * (C) Copyright 2018-2019 Rockchip Electronics Co., Ltd
17+
+ * (C) Copyright 2021 Tianling Shen
18+
+ */
19+
+
20+
+#include "rk3328-nanopi-r2s-u-boot.dtsi"
21+
--- /dev/null
22+
+++ b/arch/arm/dts/rk3328-nanopi-r2c.dts
23+
@@ -0,0 +1,47 @@
24+
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
25+
+/*
26+
+ * Copyright (c) 2021 FriendlyElec Computer Tech. Co., Ltd.
27+
+ * (http://www.friendlyarm.com)
28+
+ *
29+
+ * Copyright (c) 2021 Tianling Shen <cnsztl@immortalwrt.org>
30+
+ */
31+
+
32+
+/dts-v1/;
33+
+
34+
+#include "rk3328-nanopi-r2s.dts"
35+
+
36+
+/ {
37+
+ model = "FriendlyElec NanoPi R2C";
38+
+ compatible = "friendlyarm,nanopi-r2c", "rockchip,rk3328";
39+
+};
40+
+
41+
+&gmac2io {
42+
+ phy-handle = <&yt8521s>;
43+
+
44+
+ mdio {
45+
+ /delete-node/ ethernet-phy@1;
46+
+
47+
+ yt8521s: ethernet-phy@3 {
48+
+ compatible = "ethernet-phy-id0000.011a",
49+
+ "ethernet-phy-ieee802.3-c22";
50+
+ reg = <3>;
51+
+ pinctrl-0 = <&eth_phy_reset_pin>;
52+
+ pinctrl-names = "default";
53+
+ reset-assert-us = <10000>;
54+
+ reset-deassert-us = <50000>;
55+
+ reset-gpios = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>;
56+
+ };
57+
+ };
58+
+};
59+
+
60+
+&lan_led {
61+
+ label = "nanopi-r2c:green:lan";
62+
+};
63+
+
64+
+&sys_led {
65+
+ label = "nanopi-r2c:red:sys";
66+
+};
67+
+
68+
+&wan_led {
69+
+ label = "nanopi-r2c:green:wan";
70+
+};
71+
--- /dev/null
72+
+++ b/configs/nanopi-r2c-rk3328_defconfig
73+
@@ -0,0 +1,103 @@
74+
+CONFIG_ARM=y
75+
+CONFIG_SKIP_LOWLEVEL_INIT=y
76+
+CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
77+
+CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x300000
78+
+CONFIG_ARCH_ROCKCHIP=y
79+
+CONFIG_COUNTER_FREQUENCY=24000000
80+
+CONFIG_SYS_TEXT_BASE=0x00200000
81+
+CONFIG_SPL_GPIO_SUPPORT=y
82+
+CONFIG_NR_DRAM_BANKS=1
83+
+CONFIG_ENV_OFFSET=0x3F8000
84+
+CONFIG_DEFAULT_DEVICE_TREE="rk3328-nanopi-r2c"
85+
+CONFIG_ROCKCHIP_RK3328=y
86+
+CONFIG_TPL_ROCKCHIP_COMMON_BOARD=y
87+
+CONFIG_TPL_LIBCOMMON_SUPPORT=y
88+
+CONFIG_TPL_LIBGENERIC_SUPPORT=y
89+
+CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
90+
+CONFIG_SPL_STACK_R_ADDR=0x600000
91+
+CONFIG_DEBUG_UART_BASE=0xFF130000
92+
+CONFIG_DEBUG_UART_CLOCK=24000000
93+
+CONFIG_DEBUG_UART=y
94+
+CONFIG_TPL_SYS_MALLOC_F_LEN=0x800
95+
+CONFIG_SYS_LOAD_ADDR=0x800800
96+
+# CONFIG_ANDROID_BOOT_IMAGE is not set
97+
+CONFIG_FIT=y
98+
+CONFIG_FIT_VERBOSE=y
99+
+CONFIG_SPL_LOAD_FIT=y
100+
+CONFIG_DEFAULT_FDT_FILE="rockchip/rk3328-nanopi-r2c.dtb"
101+
+# CONFIG_DISPLAY_CPUINFO is not set
102+
+CONFIG_DISPLAY_BOARDINFO_LATE=y
103+
+CONFIG_MISC_INIT_R=y
104+
+# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
105+
+CONFIG_TPL_SYS_MALLOC_SIMPLE=y
106+
+CONFIG_SPL_STACK_R=y
107+
+CONFIG_SPL_I2C_SUPPORT=y
108+
+CONFIG_SPL_POWER_SUPPORT=y
109+
+CONFIG_SPL_ATF=y
110+
+CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y
111+
+CONFIG_CMD_BOOTZ=y
112+
+CONFIG_CMD_GPT=y
113+
+CONFIG_CMD_MMC=y
114+
+CONFIG_CMD_USB=y
115+
+# CONFIG_CMD_SETEXPR is not set
116+
+CONFIG_CMD_TIME=y
117+
+CONFIG_SPL_OF_CONTROL=y
118+
+CONFIG_TPL_OF_CONTROL=y
119+
+CONFIG_OF_SPL_REMOVE_PROPS="clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents"
120+
+CONFIG_TPL_OF_PLATDATA=y
121+
+CONFIG_ENV_IS_IN_MMC=y
122+
+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
123+
+CONFIG_NET_RANDOM_ETHADDR=y
124+
+CONFIG_TPL_DM=y
125+
+CONFIG_REGMAP=y
126+
+CONFIG_SPL_REGMAP=y
127+
+CONFIG_TPL_REGMAP=y
128+
+CONFIG_SYSCON=y
129+
+CONFIG_SPL_SYSCON=y
130+
+CONFIG_TPL_SYSCON=y
131+
+CONFIG_CLK=y
132+
+CONFIG_SPL_CLK=y
133+
+CONFIG_FASTBOOT_BUF_ADDR=0x800800
134+
+CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
135+
+CONFIG_ROCKCHIP_GPIO=y
136+
+CONFIG_SYS_I2C_ROCKCHIP=y
137+
+CONFIG_MMC_DW=y
138+
+CONFIG_MMC_DW_ROCKCHIP=y
139+
+CONFIG_SF_DEFAULT_SPEED=20000000
140+
+CONFIG_DM_ETH=y
141+
+CONFIG_ETH_DESIGNWARE=y
142+
+CONFIG_GMAC_ROCKCHIP=y
143+
+CONFIG_PINCTRL=y
144+
+CONFIG_SPL_PINCTRL=y
145+
+CONFIG_DM_PMIC=y
146+
+CONFIG_PMIC_RK8XX=y
147+
+CONFIG_SPL_DM_REGULATOR=y
148+
+CONFIG_REGULATOR_PWM=y
149+
+CONFIG_DM_REGULATOR_FIXED=y
150+
+CONFIG_SPL_DM_REGULATOR_FIXED=y
151+
+CONFIG_REGULATOR_RK8XX=y
152+
+CONFIG_PWM_ROCKCHIP=y
153+
+CONFIG_RAM=y
154+
+CONFIG_SPL_RAM=y
155+
+CONFIG_TPL_RAM=y
156+
+CONFIG_DM_RESET=y
157+
+CONFIG_BAUDRATE=1500000
158+
+CONFIG_DEBUG_UART_SHIFT=2
159+
+CONFIG_SYSINFO=y
160+
+CONFIG_SYSRESET=y
161+
+# CONFIG_TPL_SYSRESET is not set
162+
+CONFIG_USB=y
163+
+CONFIG_USB_XHCI_HCD=y
164+
+CONFIG_USB_XHCI_DWC3=y
165+
+CONFIG_USB_EHCI_HCD=y
166+
+CONFIG_USB_EHCI_GENERIC=y
167+
+CONFIG_USB_OHCI_HCD=y
168+
+CONFIG_USB_OHCI_GENERIC=y
169+
+CONFIG_USB_DWC2=y
170+
+CONFIG_USB_DWC3=y
171+
+# CONFIG_USB_DWC3_GADGET is not set
172+
+CONFIG_USB_GADGET=y
173+
+CONFIG_USB_GADGET_DWC2_OTG=y
174+
+CONFIG_SPL_TINY_MEMSET=y
175+
+CONFIG_TPL_TINY_MEMSET=y
176+
+CONFIG_ERRNO_STR=y

openwrt-22.03/patches/package/uboot-rockchip/patches/302-rockchip-rk3399-split-nanopi-r4s-out-of-evb_rk3399.patch renamed to openwrt-22.03/patches/package/uboot-rockchip-202207/patches/302-rockchip-rk3399-split-nanopi-r4s-out-of-evb_rk3399.patch

File renamed without changes.

openwrt-22.03/patches/package/uboot-rockchip/patches/303-ram-rk3399-Add-support-for-multiple-DDR-types.patch renamed to openwrt-22.03/patches/package/uboot-rockchip-202207/patches/303-ram-rk3399-Add-support-for-multiple-DDR-types.patch

File renamed without changes.

openwrt-22.03/patches/package/uboot-rockchip/patches/304-board-nanopi4-unify-1GB-4GB-variants-of-R4S.patch renamed to openwrt-22.03/patches/package/uboot-rockchip-202207/patches/304-board-nanopi4-unify-1GB-4GB-variants-of-R4S.patch

File renamed without changes.

openwrt-22.03/patches/package/uboot-rockchip/Makefile

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
include $(TOPDIR)/rules.mk
66
include $(INCLUDE_DIR)/kernel.mk
77

8-
PKG_VERSION:=2022.07
8+
PKG_VERSION:=2021.07
99
PKG_RELEASE:=$(AUTORELEASE)
1010

11-
PKG_HASH:=92b08eb49c24da14c1adbf70a71ae8f37cc53eeb4230e859ad8b6733d13dcf5e
11+
PKG_HASH:=312b7eeae44581d1362c3a3f02c28d806647756c82ba8c72241c7cdbe68ba77e
1212

1313
PKG_MAINTAINER:=Tobias Maedel <openwrt@tbspace.de>
1414

@@ -32,6 +32,7 @@ define U-Boot/nanopi-r2c-rk3328
3232
DEPENDS:=+PACKAGE_u-boot-nanopi-r2c-rk3328:arm-trusted-firmware-rockchip
3333
PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip
3434
ATF:=rk3328_bl31.elf
35+
OF_PLATDATA:=$(1)
3536
endef
3637

3738
define U-Boot/nanopi-r2s-rk3328
@@ -42,6 +43,7 @@ define U-Boot/nanopi-r2s-rk3328
4243
DEPENDS:=+PACKAGE_u-boot-nanopi-r2s-rk3328:arm-trusted-firmware-rockchip
4344
PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip
4445
ATF:=rk3328_bl31.elf
46+
OF_PLATDATA:=$(1)
4547
endef
4648

4749

@@ -92,7 +94,15 @@ UBOOT_MAKE_FLAGS += \
9294
define Build/Configure
9395
$(call Build/Configure/U-Boot)
9496

95-
$(SED) 's/CONFIG_TOOLS_LIBCRYPTO=y/# CONFIG_TOOLS_LIBCRYPTO is not set/' $(PKG_BUILD_DIR)/.config
97+
ifneq ($(OF_PLATDATA),)
98+
mkdir -p $(PKG_BUILD_DIR)/tpl/dts
99+
mkdir -p $(PKG_BUILD_DIR)/include/generated
100+
101+
$(CP) $(PKG_BUILD_DIR)/of-platdata/$(OF_PLATDATA)/dt-plat.c $(PKG_BUILD_DIR)/tpl/dts/dt-plat.c
102+
$(CP) $(PKG_BUILD_DIR)/of-platdata/$(OF_PLATDATA)/dt-structs-gen.h $(PKG_BUILD_DIR)/include/generated/dt-structs-gen.h
103+
$(CP) $(PKG_BUILD_DIR)/of-platdata/$(OF_PLATDATA)/dt-decl.h $(PKG_BUILD_DIR)/include/generated/dt-decl.h
104+
endif
105+
96106
$(SED) 's#CONFIG_MKIMAGE_DTC_PATH=.*#CONFIG_MKIMAGE_DTC_PATH="$(PKG_BUILD_DIR)/scripts/dtc/dtc"#g' $(PKG_BUILD_DIR)/.config
97107
echo 'CONFIG_IDENT_STRING=" OpenWrt"' >> $(PKG_BUILD_DIR)/.config
98108
endef
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
From b137ca16b54c67d76714ea5a0138741959b0dc29 Mon Sep 17 00:00:00 2001
2+
From: David Bauer <mail@david-bauer.net>
3+
Date: Mon, 13 Jul 2020 23:37:37 +0200
4+
Subject: [PATCH] scripts: remove dependency on swig
5+
6+
Don't build the libfdt tool, as it has a dependency on swig (which
7+
OpenWrt does not ship).
8+
9+
This requires more hacks, as of-platdata generation does not work
10+
without it.
11+
12+
Signed-off-by: David Bauer <mail@david-bauer.net>
13+
---
14+
scripts/dtc/Makefile | 2 --
15+
1 file changed, 2 deletions(-)
16+
17+
--- a/scripts/dtc/Makefile
18+
+++ b/scripts/dtc/Makefile
19+
@@ -18,5 +18,3 @@ HOSTCFLAGS_dtc-parser.tab.o := -I$(src)
20+
# dependencies on generated files need to be listed explicitly
21+
$(obj)/dtc-lexer.lex.o: $(obj)/dtc-parser.tab.h
22+
23+
-# Added for U-Boot
24+
-subdir-$(CONFIG_PYLIBFDT) += pylibfdt

0 commit comments

Comments
 (0)