[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 58f6264fa42abe2b889b5d291d8fea91088a9c8e
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, next has been updated via 58f6264fa42abe2b889b5d291d8fea91088a9c8e (commit) via 02fadedf8dfb0143b5b49c4d59eb243eefc0f4c3 (commit) via 13e001f5c258373c1d7ecd6bfd6e2c5aa4f9dc7d (commit) via fe582c9d7c2379710c13d3266d05307ff23c9aca (commit) via 0b29b37c57415784d55373b36fb291bc7b07eb5b (commit) via dac49f1b119b639fdca9b36e6af8706b41fbb821 (commit) via 954ac9df0441ebbca230cd2e0adcd91cbb9c97c1 (commit) via 1f38bac05383eef9c8065f7834f35779e79ab966 (commit) via 4c59cad1c0f8ee5846c39007bd6734b35d66264c (commit) from 577c7c09fa226bbf5f2775628f4ff330bf16c98a (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 58f6264fa42abe2b889b5d291d8fea91088a9c8e Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Oct 10 06:46:25 2021 +0000
kernel: update to 5.10.71
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 02fadedf8dfb0143b5b49c4d59eb243eefc0f4c3 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Oct 10 06:45:09 2021 +0000
initskrips: leds: add nanopi r2s support
commit 13e001f5c258373c1d7ecd6bfd6e2c5aa4f9dc7d Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri Oct 8 19:54:29 2021 +0000
kernel: config for nanopi r2s
some drivers does nozt work as module so they are now compiled into main kernel
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit fe582c9d7c2379710c13d3266d05307ff23c9aca Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri Oct 8 12:05:36 2021 +0000
u-boot: nanopi r2s: add bootcmd and 2nd mac address
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 0b29b37c57415784d55373b36fb291bc7b07eb5b Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Oct 4 06:13:18 2021 +0000
u-boot: bootscript try to use also devnum instead of dev_num
on newer board the variable was renamed.
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit dac49f1b119b639fdca9b36e6af8706b41fbb821 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Oct 4 06:07:30 2021 +0000
u-boot: set nanopi r2s baudrate to 115200
default is 150000 but many usb-ttl adapters are unstable at this rate.
commit 954ac9df0441ebbca230cd2e0adcd91cbb9c97c1 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Oct 3 07:42:41 2021 +0000
flash-images: install u-boot for nanopi r2s on aarch64
rockchip has a large bootloader so this also increase the gap between partitiontable and fist partition to 16MB on aarch64
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 1f38bac05383eef9c8065f7834f35779e79ab966 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Oct 3 07:39:04 2021 +0000
u-boot: add nanopi r2s build
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 4c59cad1c0f8ee5846c39007bd6734b35d66264c Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Oct 3 07:30:57 2021 +0000
dtc: add device tree compiler on aarch64
u-boot for nanopi r2s (rockchip rk3328) need dtc to build the image so this adds dtc as build dependency for u-boot
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/kernel/kernel.config.aarch64-ipfire | 41 +++++++++++---------- config/kernel/kernel.config.i586-ipfire | 2 +- config/kernel/kernel.config.x86_64-ipfire | 2 +- config/rootfiles/common/aarch64/dtc | 20 ++++++++++ config/rootfiles/common/aarch64/linux | 31 ++++++++-------- config/rootfiles/common/aarch64/u-boot | 6 ++- config/rootfiles/common/armv6l/linux | 3 +- config/rootfiles/common/i586/linux | 3 +- config/rootfiles/common/x86_64/linux | 3 +- config/u-boot/boot.cmd | 5 ++- config/u-boot/boot.scr | Bin 2451 -> 2514 bytes lfs/{glib => dtc} | 20 +++++----- lfs/flash-images | 5 +++ lfs/linux | 8 ++-- lfs/u-boot | 23 +++++++++++- make.sh | 1 + src/initscripts/system/leds | 11 ++++++ src/patches/dtc/dtc-1.6.1-disable_Werror.patch | 12 ++++++ .../u-boot/rockchip/generate-2-ethaddr.diff | 18 +++++++++ 19 files changed, 156 insertions(+), 58 deletions(-) create mode 100644 config/rootfiles/common/aarch64/dtc copy lfs/{glib => dtc} (90%) create mode 100644 src/patches/dtc/dtc-1.6.1-disable_Werror.patch create mode 100644 src/patches/u-boot/rockchip/generate-2-ethaddr.diff
Difference in files: diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire index ca1894a37..506a10f4f 100644 --- a/config/kernel/kernel.config.aarch64-ipfire +++ b/config/kernel/kernel.config.aarch64-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 5.10.67-ipfire Kernel Configuration +# Linux/arm64 5.10.71-ipfire Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.1.0" CONFIG_CC_IS_GCC=y @@ -3513,7 +3513,7 @@ CONFIG_I2C_NOMADIK=y CONFIG_I2C_PCA_PLATFORM=m CONFIG_I2C_PXA=m # CONFIG_I2C_PXA_SLAVE is not set -CONFIG_I2C_RK3X=m +CONFIG_I2C_RK3X=y CONFIG_I2C_SIMTEC=m CONFIG_I2C_VERSATILE=m # CONFIG_I2C_THUNDERX is not set @@ -3597,7 +3597,7 @@ CONFIG_PINCTRL_ROCKCHIP=y CONFIG_PINCTRL_SINGLE=y # CONFIG_PINCTRL_SX150X is not set CONFIG_PINCTRL_STMFX=m -CONFIG_PINCTRL_RK805=m +CONFIG_PINCTRL_RK805=y # CONFIG_PINCTRL_OCELOT is not set CONFIG_PINCTRL_BCM2835=y # CONFIG_PINCTRL_AS370 is not set @@ -4018,7 +4018,7 @@ CONFIG_IMX_THERMAL=m CONFIG_IMX8MM_THERMAL=m # CONFIG_QORIQ_THERMAL is not set CONFIG_SUN8I_THERMAL=y -CONFIG_ROCKCHIP_THERMAL=m +CONFIG_ROCKCHIP_THERMAL=y CONFIG_ARMADA_THERMAL=m CONFIG_AMLOGIC_THERMAL=y
@@ -4162,7 +4162,7 @@ CONFIG_MFD_RETU=m # CONFIG_MFD_RDC321X is not set # CONFIG_MFD_RT5033 is not set # CONFIG_MFD_RC5T583 is not set -CONFIG_MFD_RK808=m +CONFIG_MFD_RK808=y # CONFIG_MFD_RN5T618 is not set # CONFIG_MFD_SEC_CORE is not set # CONFIG_MFD_SI476X_CORE is not set @@ -4258,9 +4258,9 @@ CONFIG_REGULATOR_PFUZE100=y # CONFIG_REGULATOR_PV88060 is not set # CONFIG_REGULATOR_PV88080 is not set # CONFIG_REGULATOR_PV88090 is not set -# CONFIG_REGULATOR_PWM is not set +CONFIG_REGULATOR_PWM=y # CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY is not set -CONFIG_REGULATOR_RK808=m +CONFIG_REGULATOR_RK808=y # CONFIG_REGULATOR_RT4801 is not set # CONFIG_REGULATOR_RTMV20 is not set # CONFIG_REGULATOR_SLG51000 is not set @@ -6226,19 +6226,19 @@ CONFIG_MMC_MESON_GX=y # CONFIG_MMC_TIFM_SD is not set # CONFIG_MMC_CB710 is not set # CONFIG_MMC_VIA_SDMMC is not set -CONFIG_MMC_DW=m -CONFIG_MMC_DW_PLTFM=m +CONFIG_MMC_DW=y +CONFIG_MMC_DW_PLTFM=y # CONFIG_MMC_DW_BLUEFIELD is not set CONFIG_MMC_DW_EXYNOS=m # CONFIG_MMC_DW_HI3798CV200 is not set CONFIG_MMC_DW_K3=m # CONFIG_MMC_DW_PCI is not set -CONFIG_MMC_DW_ROCKCHIP=m +CONFIG_MMC_DW_ROCKCHIP=y CONFIG_MMC_VUB300=m CONFIG_MMC_USHC=m # CONFIG_MMC_USDHI6ROL0 is not set -# CONFIG_MMC_REALTEK_PCI is not set -# CONFIG_MMC_REALTEK_USB is not set +CONFIG_MMC_REALTEK_PCI=m +CONFIG_MMC_REALTEK_USB=m CONFIG_MMC_SUNXI=y CONFIG_MMC_CQHCI=m # CONFIG_MMC_HSQ is not set @@ -6363,7 +6363,7 @@ CONFIG_RTC_DRV_DS1374=m CONFIG_RTC_DRV_DS1672=m CONFIG_RTC_DRV_HYM8563=m CONFIG_RTC_DRV_MAX6900=m -CONFIG_RTC_DRV_RK808=m +CONFIG_RTC_DRV_RK808=y CONFIG_RTC_DRV_RS5C372=m CONFIG_RTC_DRV_ISL1208=m CONFIG_RTC_DRV_ISL12022=m @@ -6597,7 +6597,7 @@ CONFIG_CLK_VEXPRESS_OSC=y # end of Clock driver for ARM Reference designs
# CONFIG_COMMON_CLK_MAX9485 is not set -CONFIG_COMMON_CLK_RK808=m +CONFIG_COMMON_CLK_RK808=y # CONFIG_COMMON_CLK_SCMI is not set # CONFIG_COMMON_CLK_SI5341 is not set CONFIG_COMMON_CLK_SI5351=m @@ -6819,8 +6819,9 @@ CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y # # CONFIG_ARM_IMX_BUS_DEVFREQ is not set # CONFIG_ARM_IMX8M_DDRC_DEVFREQ is not set -# CONFIG_ARM_RK3399_DMC_DEVFREQ is not set -# CONFIG_PM_DEVFREQ_EVENT is not set +CONFIG_ARM_RK3399_DMC_DEVFREQ=y +CONFIG_PM_DEVFREQ_EVENT=y +CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI=y CONFIG_EXTCON=y
# @@ -6849,7 +6850,7 @@ CONFIG_PWM_BCM2835=y # CONFIG_PWM_IMX_TPM is not set # CONFIG_PWM_MESON is not set # CONFIG_PWM_PCA9685 is not set -CONFIG_PWM_ROCKCHIP=m +CONFIG_PWM_ROCKCHIP=y CONFIG_PWM_SUN4I=m CONFIG_PWM_TWL=m CONFIG_PWM_TWL_LED=m @@ -6930,11 +6931,11 @@ CONFIG_PHY_ROCKCHIP_DP=m CONFIG_PHY_ROCKCHIP_DPHY_RX0=m CONFIG_PHY_ROCKCHIP_EMMC=m CONFIG_PHY_ROCKCHIP_INNO_HDMI=m -CONFIG_PHY_ROCKCHIP_INNO_USB2=m +CONFIG_PHY_ROCKCHIP_INNO_USB2=y CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY=m -CONFIG_PHY_ROCKCHIP_PCIE=m +CONFIG_PHY_ROCKCHIP_PCIE=y CONFIG_PHY_ROCKCHIP_TYPEC=m -CONFIG_PHY_ROCKCHIP_USB=m +CONFIG_PHY_ROCKCHIP_USB=y # CONFIG_PHY_SAMSUNG_USB2 is not set # CONFIG_PHY_TUSB1210 is not set # end of PHY Subsystem diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire index e1afaf255..f21e0d4e2 100644 --- a/config/kernel/kernel.config.i586-ipfire +++ b/config/kernel/kernel.config.i586-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.10.70-ipfire Kernel Configuration +# Linux/x86 5.10.71-ipfire Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.1.0" CONFIG_CC_IS_GCC=y diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire index 12fe1082d..d83cba6bc 100644 --- a/config/kernel/kernel.config.x86_64-ipfire +++ b/config/kernel/kernel.config.x86_64-ipfire @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.10.70-ipfire Kernel Configuration +# Linux/x86 5.10.71-ipfire Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.1.0" CONFIG_CC_IS_GCC=y diff --git a/config/rootfiles/common/aarch64/dtc b/config/rootfiles/common/aarch64/dtc new file mode 100644 index 000000000..01a612799 --- /dev/null +++ b/config/rootfiles/common/aarch64/dtc @@ -0,0 +1,20 @@ +#bin/convert-dtsv0 +#bin/dtc +#bin/dtdiff +#bin/fdtdump +#bin/fdtget +#bin/fdtoverlay +#bin/fdtput +#include +#include/fdt.h +#include/libfdt.h +#include/libfdt_env.h +#lib/libfdt-1.6.1.so +#lib/libfdt.a +#lib/libfdt.so +#lib/libfdt.so.1 +#lib/python3.8 +#lib/python3.8/site-packages +#lib/python3.8/site-packages/_libfdt.cpython-38-aarch64-linux-gnu.so +#lib/python3.8/site-packages/libfdt-1.6.1-py3.8.egg-info +#lib/python3.8/site-packages/libfdt.py diff --git a/config/rootfiles/common/aarch64/linux b/config/rootfiles/common/aarch64/linux index 77dfecaa6..1bcba5b35 100644 --- a/config/rootfiles/common/aarch64/linux +++ b/config/rootfiles/common/aarch64/linux @@ -6532,6 +6532,9 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/arm/pmu/acpi.h #lib/modules/KVER-ipfire/build/include/config/arm/psci #lib/modules/KVER-ipfire/build/include/config/arm/psci/fw.h +#lib/modules/KVER-ipfire/build/include/config/arm/rk3399 +#lib/modules/KVER-ipfire/build/include/config/arm/rk3399/dmc +#lib/modules/KVER-ipfire/build/include/config/arm/rk3399/dmc/devfreq.h #lib/modules/KVER-ipfire/build/include/config/arm/scmi #lib/modules/KVER-ipfire/build/include/config/arm/scmi/power #lib/modules/KVER-ipfire/build/include/config/arm/scmi/power/domain.h @@ -7495,6 +7498,9 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/dev #lib/modules/KVER-ipfire/build/include/config/dev/coredump.h #lib/modules/KVER-ipfire/build/include/config/devfreq +#lib/modules/KVER-ipfire/build/include/config/devfreq/event +#lib/modules/KVER-ipfire/build/include/config/devfreq/event/rockchip +#lib/modules/KVER-ipfire/build/include/config/devfreq/event/rockchip/dfi.h #lib/modules/KVER-ipfire/build/include/config/devfreq/gov #lib/modules/KVER-ipfire/build/include/config/devfreq/gov/simple #lib/modules/KVER-ipfire/build/include/config/devfreq/gov/simple/ondemand.h @@ -9402,6 +9408,9 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/mmc/dw/rockchip.h #lib/modules/KVER-ipfire/build/include/config/mmc/meson #lib/modules/KVER-ipfire/build/include/config/mmc/meson/gx.h +#lib/modules/KVER-ipfire/build/include/config/mmc/realtek +#lib/modules/KVER-ipfire/build/include/config/mmc/realtek/pci.h +#lib/modules/KVER-ipfire/build/include/config/mmc/realtek/usb.h #lib/modules/KVER-ipfire/build/include/config/mmc/sdhci #lib/modules/KVER-ipfire/build/include/config/mmc/sdhci.h #lib/modules/KVER-ipfire/build/include/config/mmc/sdhci/io @@ -10412,7 +10421,9 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/pm #lib/modules/KVER-ipfire/build/include/config/pm.h #lib/modules/KVER-ipfire/build/include/config/pm/clk.h +#lib/modules/KVER-ipfire/build/include/config/pm/devfreq #lib/modules/KVER-ipfire/build/include/config/pm/devfreq.h +#lib/modules/KVER-ipfire/build/include/config/pm/devfreq/event.h #lib/modules/KVER-ipfire/build/include/config/pm/generic #lib/modules/KVER-ipfire/build/include/config/pm/generic/domains #lib/modules/KVER-ipfire/build/include/config/pm/generic/domains.h @@ -10618,6 +10629,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/regulator/gpio.h #lib/modules/KVER-ipfire/build/include/config/regulator/lp8755.h #lib/modules/KVER-ipfire/build/include/config/regulator/pfuze100.h +#lib/modules/KVER-ipfire/build/include/config/regulator/pwm.h #lib/modules/KVER-ipfire/build/include/config/regulator/rk808.h #lib/modules/KVER-ipfire/build/include/config/regulator/twl4030.h #lib/modules/KVER-ipfire/build/include/config/regulator/vexpress.h @@ -19823,7 +19835,6 @@ lib/modules/KVER-ipfire/kernel #lib/modules/KVER-ipfire/kernel/drivers/char/tpm/tpm_vtpm_proxy.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/char/virtio_console.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/clk -#lib/modules/KVER-ipfire/kernel/drivers/clk/clk-rk808.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/clk/clk-si5351.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/clk/clk-si570.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/clk/clk-twl6040.ko.xz @@ -20057,7 +20068,6 @@ lib/modules/KVER-ipfire/kernel #lib/modules/KVER-ipfire/kernel/drivers/i2c/busses/i2c-parport.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/i2c/busses/i2c-pca-platform.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/i2c/busses/i2c-pxa.ko.xz -#lib/modules/KVER-ipfire/kernel/drivers/i2c/busses/i2c-rk3x.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/i2c/busses/i2c-robotfuzz-osif.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/i2c/busses/i2c-simtec.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/i2c/busses/i2c-tiny-usb.ko.xz @@ -20739,7 +20749,6 @@ lib/modules/KVER-ipfire/kernel #lib/modules/KVER-ipfire/kernel/drivers/mfd/lm3533-ctrlbank.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/mfd/mt6360-core.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/mfd/retu-mfd.ko.xz -#lib/modules/KVER-ipfire/kernel/drivers/mfd/rk808.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/mfd/sm501.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/mfd/stmfx.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/mfd/viperboard.ko.xz @@ -20769,9 +20778,8 @@ lib/modules/KVER-ipfire/kernel #lib/modules/KVER-ipfire/kernel/drivers/mmc/host/cqhci.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/mmc/host/dw_mmc-exynos.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/mmc/host/dw_mmc-k3.ko.xz -#lib/modules/KVER-ipfire/kernel/drivers/mmc/host/dw_mmc-pltfm.ko.xz -#lib/modules/KVER-ipfire/kernel/drivers/mmc/host/dw_mmc-rockchip.ko.xz -#lib/modules/KVER-ipfire/kernel/drivers/mmc/host/dw_mmc.ko.xz +#lib/modules/KVER-ipfire/kernel/drivers/mmc/host/rtsx_pci_sdmmc.ko.xz +#lib/modules/KVER-ipfire/kernel/drivers/mmc/host/rtsx_usb_sdmmc.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/mmc/host/sdhci-of-arasan.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/mmc/host/sdhci-pxav3.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/mmc/host/ushc.ko.xz @@ -20997,7 +21005,8 @@ lib/modules/KVER-ipfire/kernel #lib/modules/KVER-ipfire/kernel/drivers/net/ethernet/mellanox/mlxsw/mlxsw_switchx2.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/net/ethernet/micrel #lib/modules/KVER-ipfire/kernel/drivers/net/ethernet/micrel/ks8842.ko.xz -#lib/modules/KVER-ipfire/kernel/drivers/net/ethernet/micrel/ks8851_mll.ko.xz +#lib/modules/KVER-ipfire/kernel/drivers/net/ethernet/micrel/ks8851_common.ko.xz +#lib/modules/KVER-ipfire/kernel/drivers/net/ethernet/micrel/ks8851_par.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/net/ethernet/micrel/ksz884x.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/net/ethernet/microchip #lib/modules/KVER-ipfire/kernel/drivers/net/ethernet/microchip/lan743x.ko.xz @@ -21453,10 +21462,7 @@ lib/modules/KVER-ipfire/kernel #lib/modules/KVER-ipfire/kernel/drivers/phy/rockchip/phy-rockchip-emmc.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/phy/rockchip/phy-rockchip-inno-dsidphy.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/phy/rockchip/phy-rockchip-inno-hdmi.ko.xz -#lib/modules/KVER-ipfire/kernel/drivers/phy/rockchip/phy-rockchip-inno-usb2.ko.xz -#lib/modules/KVER-ipfire/kernel/drivers/phy/rockchip/phy-rockchip-pcie.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/phy/rockchip/phy-rockchip-typec.ko.xz -#lib/modules/KVER-ipfire/kernel/drivers/phy/rockchip/phy-rockchip-usb.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/pinctrl #lib/modules/KVER-ipfire/kernel/drivers/pinctrl/freescale #lib/modules/KVER-ipfire/kernel/drivers/pinctrl/freescale/pinctrl-imx.ko.xz @@ -21465,7 +21471,6 @@ lib/modules/KVER-ipfire/kernel #lib/modules/KVER-ipfire/kernel/drivers/pinctrl/freescale/pinctrl-imx8mp.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/pinctrl/freescale/pinctrl-imx8mq.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/pinctrl/pinctrl-axp209.ko.xz -#lib/modules/KVER-ipfire/kernel/drivers/pinctrl/pinctrl-rk805.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/pinctrl/pinctrl-stmfx.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/power #lib/modules/KVER-ipfire/kernel/drivers/power/reset @@ -21482,13 +21487,11 @@ lib/modules/KVER-ipfire/kernel #lib/modules/KVER-ipfire/kernel/drivers/ptp/ptp_clockmatrix.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/ptp/ptp_idt82p33.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/pwm -#lib/modules/KVER-ipfire/kernel/drivers/pwm/pwm-rockchip.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/pwm/pwm-sun4i.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/pwm/pwm-twl-led.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/pwm/pwm-twl.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/regulator #lib/modules/KVER-ipfire/kernel/drivers/regulator/axp20x-regulator.ko.xz -#lib/modules/KVER-ipfire/kernel/drivers/regulator/rk808-regulator.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/reset #lib/modules/KVER-ipfire/kernel/drivers/reset/reset-scmi.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/rtc @@ -21523,7 +21526,6 @@ lib/modules/KVER-ipfire/kernel #lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-pcf8583.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-pl030.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-pl031.ko.xz -#lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-rk808.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-rp5c01.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-rs5c372.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-rv3029c2.ko.xz @@ -21575,7 +21577,6 @@ lib/modules/KVER-ipfire/kernel #lib/modules/KVER-ipfire/kernel/drivers/thermal/armada_thermal.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/thermal/imx8mm_thermal.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/thermal/imx_thermal.ko.xz -#lib/modules/KVER-ipfire/kernel/drivers/thermal/rockchip_thermal.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/tty #lib/modules/KVER-ipfire/kernel/drivers/tty/n_gsm.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/tty/n_hdlc.ko.xz diff --git a/config/rootfiles/common/aarch64/u-boot b/config/rootfiles/common/aarch64/u-boot index 5b2d5cf09..bef7b7986 100644 --- a/config/rootfiles/common/aarch64/u-boot +++ b/config/rootfiles/common/aarch64/u-boot @@ -1,11 +1,13 @@ boot/boot.cmd boot/boot.mk boot/boot.scr -boot/uEnv.txt -boot/uboot.env boot/u-boot-rpi3.bin boot/u-boot-rpi4.bin +boot/uEnv.txt +boot/uboot.env #usr/share/u-boot +#usr/share/u-boot/nanopi_r2s +usr/share/u-boot/nanopi_r2s/u-boot-rockchip.bin #usr/share/u-boot/rpi usr/share/u-boot/rpi/u-boot-rpi3.bin usr/share/u-boot/rpi/u-boot-rpi4.bin diff --git a/config/rootfiles/common/armv6l/linux b/config/rootfiles/common/armv6l/linux index 7b389204a..1f2318123 100644 --- a/config/rootfiles/common/armv6l/linux +++ b/config/rootfiles/common/armv6l/linux @@ -21314,7 +21314,8 @@ lib/modules/KVER-ipfire/kernel #lib/modules/KVER-ipfire/kernel/drivers/net/ethernet/mellanox/mlxsw/mlxsw_switchx2.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/net/ethernet/micrel #lib/modules/KVER-ipfire/kernel/drivers/net/ethernet/micrel/ks8842.ko.xz -#lib/modules/KVER-ipfire/kernel/drivers/net/ethernet/micrel/ks8851_mll.ko.xz +#lib/modules/KVER-ipfire/kernel/drivers/net/ethernet/micrel/ks8851_common.ko.xz +#lib/modules/KVER-ipfire/kernel/drivers/net/ethernet/micrel/ks8851_par.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/net/ethernet/micrel/ksz884x.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/net/ethernet/microchip #lib/modules/KVER-ipfire/kernel/drivers/net/ethernet/microchip/lan743x.ko.xz diff --git a/config/rootfiles/common/i586/linux b/config/rootfiles/common/i586/linux index 4e82c0509..b965e9360 100644 --- a/config/rootfiles/common/i586/linux +++ b/config/rootfiles/common/i586/linux @@ -22180,7 +22180,8 @@ lib/modules/KVER-ipfire/kernel #lib/modules/KVER-ipfire/kernel/drivers/net/ethernet/mellanox/mlxsw/mlxsw_switchx2.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/net/ethernet/micrel #lib/modules/KVER-ipfire/kernel/drivers/net/ethernet/micrel/ks8842.ko.xz -#lib/modules/KVER-ipfire/kernel/drivers/net/ethernet/micrel/ks8851_mll.ko.xz +#lib/modules/KVER-ipfire/kernel/drivers/net/ethernet/micrel/ks8851_common.ko.xz +#lib/modules/KVER-ipfire/kernel/drivers/net/ethernet/micrel/ks8851_par.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/net/ethernet/micrel/ksz884x.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/net/ethernet/microchip #lib/modules/KVER-ipfire/kernel/drivers/net/ethernet/microchip/lan743x.ko.xz diff --git a/config/rootfiles/common/x86_64/linux b/config/rootfiles/common/x86_64/linux index 13c3bbe19..b9c714766 100644 --- a/config/rootfiles/common/x86_64/linux +++ b/config/rootfiles/common/x86_64/linux @@ -22034,7 +22034,8 @@ lib/modules/KVER-ipfire/kernel #lib/modules/KVER-ipfire/kernel/drivers/net/ethernet/mellanox/mlxsw/mlxsw_switchx2.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/net/ethernet/micrel #lib/modules/KVER-ipfire/kernel/drivers/net/ethernet/micrel/ks8842.ko.xz -#lib/modules/KVER-ipfire/kernel/drivers/net/ethernet/micrel/ks8851_mll.ko.xz +#lib/modules/KVER-ipfire/kernel/drivers/net/ethernet/micrel/ks8851_common.ko.xz +#lib/modules/KVER-ipfire/kernel/drivers/net/ethernet/micrel/ks8851_par.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/net/ethernet/micrel/ksz884x.ko.xz #lib/modules/KVER-ipfire/kernel/drivers/net/ethernet/microchip #lib/modules/KVER-ipfire/kernel/drivers/net/ethernet/microchip/lan743x.ko.xz diff --git a/config/u-boot/boot.cmd b/config/u-boot/boot.cmd index 8cb8e5fc2..64e9c05bc 100644 --- a/config/u-boot/boot.cmd +++ b/config/u-boot/boot.cmd @@ -4,7 +4,10 @@ if test ${boot_dev} = ""; then fi;
if test ${dev_num} = ""; then - setenv dev_num 0; + setenv dev_num ${devnum} + if test ${dev_num} = ""; then + setenv dev_num 0; + fi; fi;
if test ${boot_part} = ""; then diff --git a/config/u-boot/boot.scr b/config/u-boot/boot.scr index 370ddde49..875e09dc2 100644 Binary files a/config/u-boot/boot.scr and b/config/u-boot/boot.scr differ diff --git a/lfs/dtc b/lfs/dtc new file mode 100644 index 000000000..894b84acc --- /dev/null +++ b/lfs/dtc @@ -0,0 +1,81 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2021 IPFire Team info@ipfire.org # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see http://www.gnu.org/licenses/. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.6.1 + +THISAPP = dtc-$(VER) +DL_FILE = $(THISAPP).tar.xz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +SUP_ARCH = aarch64 + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 709888bac3aad657e6020d0e491fc0ba + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/dtc/dtc-1.6.1-disable_Werror.patch + + cd $(DIR_APP) && make HOME= $(MAKETUNING) + cd $(DIR_APP) && make HOME= install + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/flash-images b/lfs/flash-images index cdd0fbf7e..0abb23b0a 100644 --- a/lfs/flash-images +++ b/lfs/flash-images @@ -67,6 +67,7 @@ ifeq "$(BUILD_PLATFORM)" "arm" PART_TYPE = c ifeq "$(BUILD_ARCH)" "aarch64" BOOTLOADER = grub + S_OFFSET = 32768 endif else BOOTLOADER = grub @@ -260,6 +261,10 @@ ifeq "$(BUILD_ARCH)" "armv6l" # Install u-boot for Orangepi Zero/Nanopi DUO into image 8KB dd if=/usr/share/u-boot/orangepi_zero/u-boot-sunxi-with-spl.bin of=$(IMG) bs=1K seek=8 conv=notrunc endif +ifeq "$(BUILD_ARCH)" "aarch64" + # Install u-boot for NanoPi R2S into image 8KB + dd if=/usr/share/u-boot/nanopi_r2s/u-boot-rockchip.bin of=$(IMG) bs=1K seek=32 conv=notrunc +endif
# Compress Image xz $(XZ_OPT) < $(IMG) > $(IMAGE_FILE) diff --git a/lfs/linux b/lfs/linux index 6f381c36f..154e32085 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,8 +24,8 @@
include Config
-VER = 5.10.70 -ARM_PATCHES = 5.10.70-ipfire1 +VER = 5.10.71 +ARM_PATCHES = 5.10.71-ipfire1
THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -77,8 +77,8 @@ objects =$(DL_FILE) \ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) arm-multi-patches-$(ARM_PATCHES).patch.xz = $(URL_IPFIRE)/arm-multi-patches-$(ARM_PATCHES).patch.xz
-$(DL_FILE)_MD5 = 40ec9411f1bb6909ab2dccd55a479143 -arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5 = 8344fdeb190912cf32482dc6d51fba31 +$(DL_FILE)_MD5 = f3513f8f838a4c3b2da2a2d7447eea65 +arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5 = 02a75302a5b4a157e3d67ae62af6b178
install : $(TARGET)
diff --git a/lfs/u-boot b/lfs/u-boot index 9f3addd29..4fd6289d9 100644 --- a/lfs/u-boot +++ b/lfs/u-boot @@ -33,15 +33,19 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP)-$(MKIMAGE) SUP_ARCH = armv6l aarch64
+CFLAGS := $(patsubst -fstack-protector-strong,,$(CFLAGS)) + ############################################################################### # Top-level Rules ###############################################################################
-objects = $(DL_FILE) +objects = $(DL_FILE) arm-trusted-firmware-2.5.tar.gz
$(DL_FILE) = $(DL_FROM)/$(DL_FILE) +arm-trusted-firmware-2.5.tar.gz = $(DL_FROM)/arm-trusted-firmware-2.5.tar.gz
$(DL_FILE)_MD5 = 7afbe0ef070dc0e8e970c57a08e3f336 +arm-trusted-firmware-2.5.tar.gz_MD5 = a3c01d2a73d5171e3f1c0737ff5321d9
install : $(TARGET)
@@ -178,6 +182,23 @@ else cd $(DIR_APP) && install u-boot.bin /boot/u-boot-rpi4.bin cd $(DIR_APP) && make distclean
+ # Nanopi R2S + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/u-boot/rockchip/generate-2-ethaddr.diff + cd $(DIR_APP) && rm -rf arm-trusted-firmware-2.5 + cd $(DIR_APP) && tar axf $(DIR_DL)/arm-trusted-firmware-2.5.tar.gz + cd $(DIR_APP)/arm-trusted-firmware-2.5 && make PLAT=rk3328 ARCH=aarch64 DEBUG=0 bl31 + cd $(DIR_APP) && cp arm-trusted-firmware-2.5/build/rk3328/release/bl31/bl31.elf bl31.elf + cd $(DIR_APP) && rm -rf arm-trusted-firmware-2.5 + -mkdir -pv /usr/share/u-boot/nanopi_r2s + cd $(DIR_APP) && make CROSS_COMPILE="" nanopi-r2s-rk3328_config + cd $(DIR_APP) && sed -i -e 's!^CONFIG_IDENT_STRING=.*!CONFIG_IDENT_STRING=" Nanopi R2S - IPFire.org"!' .config + cd $(DIR_APP) && sed -i -e 's!^CONFIG_BOOTCOMMAND=.*!CONFIG_BOOTCOMMAND="console=ttyS2,115200n8;run distro_bootcmd"!' .config + cd $(DIR_APP) && sed -i -e 's!^CONFIG_BAUDRATE=.*!CONFIG_BAUDRATE=115200"!' .config + cd $(DIR_APP) && make CROSS_COMPILE="" HOSTCC="gcc $(CFLAGS)" + cd $(DIR_APP) && install -v -m 644 u-boot-rockchip.bin \ + /usr/share/u-boot/nanopi_r2s/u-boot-rockchip.bin + cd $(DIR_APP) && make distclean + endif # create an empty 128 KB File for the u-boot env dd if=/dev/zero of=/boot/uboot.env bs=1K count=128 diff --git a/make.sh b/make.sh index 5c60f029b..2b89eb4ec 100755 --- a/make.sh +++ b/make.sh @@ -1515,6 +1515,7 @@ buildipfire() { lfsmake2 powertop lfsmake2 parted lfsmake2 swig + lfsmake2 dtc lfsmake2 u-boot lfsmake2 u-boot-friendlyarm lfsmake2 wireless-regdb diff --git a/src/initscripts/system/leds b/src/initscripts/system/leds index d7b01e570..07147ce6c 100644 --- a/src/initscripts/system/leds +++ b/src/initscripts/system/leds @@ -121,6 +121,11 @@ case "${1}" in setup_netdev_trigger nanopi-r1:green:wan ${RED_DEV} tx rx setup_netdev_trigger nanopi-r1:green:lan ${GREEN_DEV} tx rx
+ # Nanopi R1 start + setup_heartbeat_trigger nanopi-r2s:red:sys + setup_netdev_trigger nanopi-r2s:green:wan ${RED_DEV} tx rx + setup_netdev_trigger nanopi-r2s:green:lan ${GREEN_DEV} tx rx + exit 0 ;;
@@ -155,6 +160,12 @@ case "${1}" in disable_led_trigger nanopi-r1:green:wan disable_led_trigger nanopi-r1:green:lan
+ # Nanopi R2S stop + disable_led_trigger nanopi-r2s:red:sys + enable_led nanopi-r2s:red:sys + disable_led_trigger nanopi-r2s:green:wan + disable_led_trigger nanopi-r2s:green:lan + exit 0 ;;
diff --git a/src/patches/dtc/dtc-1.6.1-disable_Werror.patch b/src/patches/dtc/dtc-1.6.1-disable_Werror.patch new file mode 100644 index 000000000..89870df81 --- /dev/null +++ b/src/patches/dtc/dtc-1.6.1-disable_Werror.patch @@ -0,0 +1,12 @@ +diff -Naur dtc-1.6.1.org/Makefile dtc-1.6.1/Makefile +--- dtc-1.6.1.org/Makefile 2021-06-08 07:00:49.000000000 +0000 ++++ dtc-1.6.1/Makefile 2021-10-01 07:57:58.344551140 +0000 +@@ -23,7 +23,7 @@ + CPPFLAGS = -I libfdt -I . -DFDT_ASSUME_MASK=$(ASSUME_MASK) + WARNINGS = -Wall -Wpointer-arith -Wcast-qual -Wnested-externs \ + -Wstrict-prototypes -Wmissing-prototypes -Wredundant-decls -Wshadow +-CFLAGS = -g -Os $(SHAREDLIB_CFLAGS) -Werror $(WARNINGS) $(EXTRA_CFLAGS) ++CFLAGS = -g -Os $(SHAREDLIB_CFLAGS) $(EXTRA_CFLAGS) + + BISON = bison + LEX = flex diff --git a/src/patches/u-boot/rockchip/generate-2-ethaddr.diff b/src/patches/u-boot/rockchip/generate-2-ethaddr.diff new file mode 100644 index 000000000..067c8b503 --- /dev/null +++ b/src/patches/u-boot/rockchip/generate-2-ethaddr.diff @@ -0,0 +1,18 @@ +diff -Naur u-boot-2021.07.org/arch/arm/mach-rockchip/misc.c u-boot-2021.07/arch/arm/mach-rockchip/misc.c +--- u-boot-2021.07.org/arch/arm/mach-rockchip/misc.c 2021-07-05 15:11:28.000000000 +0000 ++++ u-boot-2021.07/arch/arm/mach-rockchip/misc.c 2021-10-08 10:47:13.704806367 +0000 +@@ -49,9 +49,12 @@ + memcpy(mac_addr, hash, 6); + + /* Make this a valid MAC address and set it */ +- mac_addr[0] &= 0xfe; /* clear multicast bit */ +- mac_addr[0] |= 0x02; /* set local assignment bit (IEEE802) */ ++ mac_addr[0] = 0x02; /* set local assignment bit (IEEE802) */ + eth_env_set_enetaddr("ethaddr", mac_addr); ++ if (env_get("eth1addr")) ++ return 0; ++ mac_addr[0] = 0x12; /* set local assignment bit (IEEE802) */ ++ eth_env_set_enetaddr("eth1addr", mac_addr); + #endif + return 0; + }
hooks/post-receive -- IPFire 2.x development tree
-
Arne Fitzenreiter