From ba48db8275730fbc512c0872ae426970a09b5619 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 22 Sep 2022 14:03:07 +0200 Subject: add support for STM32F746G-DISCO device Tested with toolbox / simpleinit as userland. FDPIC/FLAT support both successfully tested. No LCD or Ethernet support. --- mk/image.mk | 13 +- mk/linux-ver.mk | 12 +- package/dtc/patches/patch-Makefile | 11 + package/gettext/Makefile | 1 + package/popt/Makefile | 5 +- package/popt/patches/patch-Makefile_am | 11 + package/u-boot/Makefile | 11 +- rules.mk | 1 + scripts/flash-uboot.sh | 23 + target/arm/Makefile | 7 +- target/arm/kernel/st-stm32f746g | 31 + target/arm/st-stm32f746g/extlinux.conf | 4 + target/arm/st-stm32f746g/genimage.cfg | 27 + target/arm/systems/st-stm32f746g | 17 + target/config/Config.in.kernelfmt | 1 + target/config/Config.in.rootfs | 5 +- target/config/Config.in.runtime | 1 + target/config/Config.in.tools | 1 - target/linux/Config.in.kernelcfg | 1 + target/linux/Config.in.kernelversion | 6 +- .../linux/patches/4.14.252/alpha-remove-coff.patch | 43 - target/linux/patches/4.14.252/arm-nommu.patch | 81 - target/linux/patches/4.14.252/arm-thumb2.patch | 16 - target/linux/patches/4.14.252/h8300.patch | 12 - .../patches/4.14.252/initramfs-nosizelimit.patch | 21 - .../patches/4.14.252/microblaze-sigaltstack.patch | 12 - target/linux/patches/4.14.252/or1k-more-ram.patch | 12 - target/linux/patches/4.14.252/startup.patch | 25 - target/linux/patches/4.14.252/vdso2.patch | 27 - .../linux/patches/4.14.293/alpha-remove-coff.patch | 43 + target/linux/patches/4.14.293/arm-nommu.patch | 81 + target/linux/patches/4.14.293/arm-thumb2.patch | 16 + target/linux/patches/4.14.293/h8300.patch | 12 + .../patches/4.14.293/initramfs-nosizelimit.patch | 21 + .../patches/4.14.293/microblaze-sigaltstack.patch | 12 + target/linux/patches/4.14.293/or1k-more-ram.patch | 12 + target/linux/patches/4.14.293/startup.patch | 25 + target/linux/patches/4.14.293/vdso2.patch | 27 + target/linux/patches/4.19.213/arc.patch | 12 - target/linux/patches/4.19.213/arm-nommu.patch | 81 - target/linux/patches/4.19.213/darwin-dtc.patch | 26 - .../linux/patches/4.19.213/darwin-file2alias.patch | 14 - target/linux/patches/4.19.213/fec-coldfire.patch | 118 - target/linux/patches/4.19.213/or1k-more-ram.patch | 12 - target/linux/patches/4.19.213/relocs.patch | 2698 -------------------- target/linux/patches/4.19.213/startup.patch | 25 - target/linux/patches/4.19.213/vdso2.patch | 24 - target/linux/patches/4.19.258/arc.patch | 12 + target/linux/patches/4.19.258/arm-nommu.patch | 81 + target/linux/patches/4.19.258/darwin-dtc.patch | 26 + .../linux/patches/4.19.258/darwin-file2alias.patch | 14 + target/linux/patches/4.19.258/fec-coldfire.patch | 118 + target/linux/patches/4.19.258/or1k-more-ram.patch | 12 + target/linux/patches/4.19.258/relocs.patch | 2698 ++++++++++++++++++++ target/linux/patches/4.19.258/startup.patch | 25 + target/linux/patches/4.19.258/vdso2.patch | 24 + target/linux/patches/5.19.9/darwin-dtc.patch | 26 + .../linux/patches/5.19.9/darwin-file2alias.patch | 14 + target/linux/patches/5.19.9/dtc-noyaml.patch | 16 + target/linux/patches/5.19.9/or1k-more-ram.patch | 12 + target/linux/patches/5.19.9/relocs.patch | 2698 ++++++++++++++++++++ target/linux/patches/5.19.9/startup.patch | 25 + toolchain/elf2flt/Makefile.inc | 4 +- .../0001-elf2flt-handle-binutils-2.34.patch | 377 +++ ...reinstate-32-byte-alignment-for-.data-sec.patch | 81 + .../0003-elf2flt-add-riscv-64-bits-support.patch | 103 + ...4-elf2flt-create-a-common-helper-function.patch | 76 + ...-fatal-error-regression-on-m68k-xtensa-ri.patch | 73 + 68 files changed, 6930 insertions(+), 3282 deletions(-) create mode 100644 package/dtc/patches/patch-Makefile create mode 100644 package/popt/patches/patch-Makefile_am create mode 100755 scripts/flash-uboot.sh create mode 100644 target/arm/kernel/st-stm32f746g create mode 100644 target/arm/st-stm32f746g/extlinux.conf create mode 100644 target/arm/st-stm32f746g/genimage.cfg create mode 100644 target/arm/systems/st-stm32f746g delete mode 100644 target/linux/patches/4.14.252/alpha-remove-coff.patch delete mode 100644 target/linux/patches/4.14.252/arm-nommu.patch delete mode 100644 target/linux/patches/4.14.252/arm-thumb2.patch delete mode 100644 target/linux/patches/4.14.252/h8300.patch delete mode 100644 target/linux/patches/4.14.252/initramfs-nosizelimit.patch delete mode 100644 target/linux/patches/4.14.252/microblaze-sigaltstack.patch delete mode 100644 target/linux/patches/4.14.252/or1k-more-ram.patch delete mode 100644 target/linux/patches/4.14.252/startup.patch delete mode 100644 target/linux/patches/4.14.252/vdso2.patch create mode 100644 target/linux/patches/4.14.293/alpha-remove-coff.patch create mode 100644 target/linux/patches/4.14.293/arm-nommu.patch create mode 100644 target/linux/patches/4.14.293/arm-thumb2.patch create mode 100644 target/linux/patches/4.14.293/h8300.patch create mode 100644 target/linux/patches/4.14.293/initramfs-nosizelimit.patch create mode 100644 target/linux/patches/4.14.293/microblaze-sigaltstack.patch create mode 100644 target/linux/patches/4.14.293/or1k-more-ram.patch create mode 100644 target/linux/patches/4.14.293/startup.patch create mode 100644 target/linux/patches/4.14.293/vdso2.patch delete mode 100644 target/linux/patches/4.19.213/arc.patch delete mode 100644 target/linux/patches/4.19.213/arm-nommu.patch delete mode 100644 target/linux/patches/4.19.213/darwin-dtc.patch delete mode 100644 target/linux/patches/4.19.213/darwin-file2alias.patch delete mode 100644 target/linux/patches/4.19.213/fec-coldfire.patch delete mode 100644 target/linux/patches/4.19.213/or1k-more-ram.patch delete mode 100644 target/linux/patches/4.19.213/relocs.patch delete mode 100644 target/linux/patches/4.19.213/startup.patch delete mode 100644 target/linux/patches/4.19.213/vdso2.patch create mode 100644 target/linux/patches/4.19.258/arc.patch create mode 100644 target/linux/patches/4.19.258/arm-nommu.patch create mode 100644 target/linux/patches/4.19.258/darwin-dtc.patch create mode 100644 target/linux/patches/4.19.258/darwin-file2alias.patch create mode 100644 target/linux/patches/4.19.258/fec-coldfire.patch create mode 100644 target/linux/patches/4.19.258/or1k-more-ram.patch create mode 100644 target/linux/patches/4.19.258/relocs.patch create mode 100644 target/linux/patches/4.19.258/startup.patch create mode 100644 target/linux/patches/4.19.258/vdso2.patch create mode 100644 target/linux/patches/5.19.9/darwin-dtc.patch create mode 100644 target/linux/patches/5.19.9/darwin-file2alias.patch create mode 100644 target/linux/patches/5.19.9/dtc-noyaml.patch create mode 100644 target/linux/patches/5.19.9/or1k-more-ram.patch create mode 100644 target/linux/patches/5.19.9/relocs.patch create mode 100644 target/linux/patches/5.19.9/startup.patch create mode 100644 toolchain/elf2flt/patches/v2021.08/0001-elf2flt-handle-binutils-2.34.patch create mode 100644 toolchain/elf2flt/patches/v2021.08/0002-elf2flt.ld-reinstate-32-byte-alignment-for-.data-sec.patch create mode 100644 toolchain/elf2flt/patches/v2021.08/0003-elf2flt-add-riscv-64-bits-support.patch create mode 100644 toolchain/elf2flt/patches/v2021.08/0004-elf2flt-create-a-common-helper-function.patch create mode 100644 toolchain/elf2flt/patches/v2021.08/0005-elf2flt-fix-fatal-error-regression-on-m68k-xtensa-ri.patch diff --git a/mk/image.mk b/mk/image.mk index 1a080557a..77046a191 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -332,12 +332,19 @@ GENCFG:=$(ADK_TOPDIR)/adk/genimage/$(ADK_TARGET_GENIMAGE_FILENAME) else GENCFG:=$(ADK_TOPDIR)/target/$(ADK_TARGET_ARCH)/$(ADK_TARGET_SYSTEM)/$(ADK_TARGET_GENIMAGE_FILENAME) endif +ifeq (,$(wildcard $(ADK_TOPDIR)/target/$(ADK_TARGET_ARCH)/$(ADK_TARGET_SYSTEM)/$(ADK_TARGET_EXTLINUX_FILENAME))) +EXTLINUX:=$(ADK_TOPDIR)/adk/extlinux/$(ADK_TARGET_EXTLINUX_FILENAME) +else +EXTLINUX:=$(ADK_TOPDIR)/target/$(ADK_TARGET_ARCH)/$(ADK_TARGET_SYSTEM)/$(ADK_TARGET_EXTLINUX_FILENAME) +endif ${FW_DIR}/${GENIMAGE}: ${TARGET_DIR} kernel-package @rm -rf ${FW_DIR}/temp @mkdir -p ${FW_DIR}/temp @$(CP) $(KERNEL) $(FW_DIR)/kernel @dd if=/dev/zero of=${FW_DIR}/cfgfs.img bs=16384 count=1 $(MAKE_TRACE) + @mkdir -p ${FW_DIR}/extlinux + @$(CP) $(EXTLINUX) $(FW_DIR)/extlinux ifeq ($(ADK_RUNTIME_FIX_PERMISSION),y) echo '#!/bin/sh' > $(ADK_TOPDIR)/scripts/fakeroot.sh echo "chown -R 0:0 $(TARGET_DIR)" >> $(ADK_TOPDIR)/scripts/fakeroot.sh @@ -347,10 +354,10 @@ ifeq ($(ADK_RUNTIME_FIX_PERMISSION),y) PATH='$(HOST_PATH)' $(FAKEROOT) $(ADK_TOPDIR)/scripts/fakeroot.sh rm $(ADK_TOPDIR)/scripts/fakeroot.sh $(STAGING_TARGET_DIR)/scripts/permissions.sh endif - PATH='${HOST_PATH}' $(FAKEROOT) mke2img \ - -G 4 \ + PATH='${HOST_PATH}' $(FAKEROOT) mkfs.ext2 \ -d "$(TARGET_DIR)" \ - -o $(FW_DIR)/rootfs.ext $(MAKE_TRACE) + -r 1 -N 0 -m 5 -L "rootfs" \ + $(FW_DIR)/rootfs.ext "32M" $(MAKE_TRACE) PATH='${HOST_PATH}' genimage \ --config "$(GENCFG)" \ --tmppath "${FW_DIR}/temp" \ diff --git a/mk/linux-ver.mk b/mk/linux-ver.mk index 6126798f9..cc833d16b 100644 --- a/mk/linux-ver.mk +++ b/mk/linux-ver.mk @@ -16,10 +16,10 @@ KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(ADK_TARGET_LINUX_KERNEL_GIT_VER)-$(KERNEL_RELEASE) endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_5_19),y) -KERNEL_FILE_VER:= 5.19 +KERNEL_FILE_VER:= 5.19.9 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= ff240c579b9ee1affc318917de07394fc1c3bb49dac25ec1287370c2e15005a8 +KERNEL_HASH:= 0ad5b5986693adc1962be807bc3a64423a24b6a9da9df39b259d7e3bfd927f37 endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_5_15),y) KERNEL_FILE_VER:= 5.15.23 @@ -40,16 +40,16 @@ KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) KERNEL_HASH:= 0d16d343956d311e3f4ab3f032fd626d8e6b67c0db94edd32f561407d374f2a0 endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_4_19),y) -KERNEL_FILE_VER:= 4.19.213 +KERNEL_FILE_VER:= 4.19.258 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= 38f28c1cd6db0b54ee37a14fd17db651fe68704d08f95e141b14d32b872f4e98 +KERNEL_HASH:= 3d1542f89867779d5f73cfe31973dee316b974421d38b7c79dbf892316e25a00 endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_4_14),y) -KERNEL_FILE_VER:= 4.14.252 +KERNEL_FILE_VER:= 4.14.293 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= 933bb2e9359165da8a7eb8ae8321e88e3e070c34b827d51937ff3ba443e15908 +KERNEL_HASH:= 828c29c4f67458ee909a209c111ccc76634450b70e56da954cf1ee8c6da2ef10 endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_4_9),y) KERNEL_FILE_VER:= 4.9.287 diff --git a/package/dtc/patches/patch-Makefile b/package/dtc/patches/patch-Makefile new file mode 100644 index 000000000..9a4553381 --- /dev/null +++ b/package/dtc/patches/patch-Makefile @@ -0,0 +1,11 @@ +--- dtc-1.6.1.orig/Makefile 2021-06-08 09:00:49.000000000 +0200 ++++ dtc-1.6.1/Makefile 2022-09-20 08:58:33.198381442 +0200 +@@ -23,7 +23,7 @@ ASSUME_MASK ?= 0 + 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) $(WARNINGS) $(EXTRA_CFLAGS) + + BISON = bison + LEX = flex diff --git a/package/gettext/Makefile b/package/gettext/Makefile index 82439e19e..6594eb995 100644 --- a/package/gettext/Makefile +++ b/package/gettext/Makefile @@ -9,6 +9,7 @@ PKG_RELEASE:= 1 PKG_HASH:= 9c1781328238caa1685d7bc7a2e1dcf1c6c134e86b42ed554066734b621bd12f PKG_DESCR:= i18n tools and libs PKG_SECTION:= libs/misc +HOST_BUILDDEP:= automake-host PKG_URL:= https://www.gnu.org/software/gettext/ PKG_SITES:= http://ftp.gnu.org/pub/gnu/gettext/ PKG_OPTS:= dev diff --git a/package/popt/Makefile b/package/popt/Makefile index d9582474b..bd1746a90 100644 --- a/package/popt/Makefile +++ b/package/popt/Makefile @@ -4,13 +4,14 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= popt -PKG_VERSION:= 1.18 +PKG_VERSION:= 1.19 PKG_RELEASE:= 1 -PKG_HASH:= 36245242c59b5a33698388e415a3e1efa2d48fc4aead91aeb2810b4c0744f4e3 +PKG_HASH:= 6eb40d650526cb9fe63eb4415bcecdf9cf306f7556e77eff689abc5a44670060 PKG_DESCR:= command line option parsing library PKG_SECTION:= libs/misc PKG_URL:= http://rpm5.org/ PKG_BUILDDEP:= gettext-host +HOST_BUILDDEP:= gettext-host libtool-host PKG_SITES:= https://github.com/rpm-software-management/popt/archive/refs/tags/ PKG_LIBNAME:= libpopt PKG_OPTS:= dev diff --git a/package/popt/patches/patch-Makefile_am b/package/popt/patches/patch-Makefile_am new file mode 100644 index 000000000..0c25da403 --- /dev/null +++ b/package/popt/patches/patch-Makefile_am @@ -0,0 +1,11 @@ +--- popt-popt-1.19-release.orig/Makefile.am 2022-09-16 09:05:46.000000000 +0200 ++++ popt-popt-1.19-release/Makefile.am 2022-09-21 02:11:30.830446841 +0200 +@@ -4,7 +4,7 @@ MCCABE = pmccabe + + EXTRA_DIST = autogen.sh CREDITS $(man_MANS) ci/Dockerfile build-aux popt.pdf + +-SUBDIRS = src po tests ++SUBDIRS = src + + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = popt.pc diff --git a/package/u-boot/Makefile b/package/u-boot/Makefile index 03bc50d76..617233c09 100644 --- a/package/u-boot/Makefile +++ b/package/u-boot/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= u-boot -PKG_VERSION:= 2021.10 +PKG_VERSION:= 2022.10-rc5 PKG_RELEASE:= 1 -PKG_HASH:= cde723e19262e646f2670d25e5ec4b1b368490de950d4e26275a988c36df0bd4 +PKG_HASH:= 064bf54541fc4eb30f0dd336702484ba5d39c4aceb48042216d8e72294c5787d PKG_DESCR:= portable bootloader PKG_SECTION:= base/boot HOST_BUILDDEP:= libressl-host dtc-host @@ -16,7 +16,7 @@ PKG_SITES:= ftp://ftp.denx.de/pub/u-boot/ DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SYSTEM_DEPENDS:= beaglebone-black orange-pi0 raspberry-pi raspberry-pi2 raspberry-pi3 banana-pro solidrun-imx6 solidrun-clearfog raspberry-pi3-64 raspberry-pi3p raspberry-pi3p-64 phytec-imx6 pcduino-3b imgtec-ci20 +PKG_SYSTEM_DEPENDS:= beaglebone-black orange-pi0 raspberry-pi raspberry-pi2 raspberry-pi3 banana-pro solidrun-imx6 solidrun-clearfog raspberry-pi3-64 raspberry-pi3p raspberry-pi3p-64 phytec-imx6 pcduino-3b imgtec-ci20 st-stm32f746g include $(ADK_TOPDIR)/mk/host.mk include $(ADK_TOPDIR)/mk/package.mk @@ -74,6 +74,10 @@ ifeq ($(ADK_TARGET_SYSTEM_IMGTEC_CI20),y) CONFIG:= ci20_mmc_defconfig UBOOT:= u-boot-dtb.img endif +ifeq ($(ADK_TARGET_SYSTEM_ST_STM32F746G),y) +CONFIG:= stm32f746-disco_spl_defconfig +UBOOT:= u-boot-dtb.bin +endif HOST_MAKE_FLAGS+= HOSTCFLAGS="$(HOST_CPPFLAGS) $(HOST_CFLAGS)" \ HOSTLDFLAGS="$(HOST_LDFLAGS) -ldl" @@ -97,6 +101,7 @@ do-configure: do-build: (cd $(WRKBUILD) && env \ + V=1 \ PATH='$(HOST_PATH)' \ CROSS_COMPILE='$(TARGET_CROSS)' \ $(MAKE)) diff --git a/rules.mk b/rules.mk index 758a2c163..234f5e345 100644 --- a/rules.mk +++ b/rules.mk @@ -76,6 +76,7 @@ ADK_TARGET_LINUX_KERNEL_GIT_VER:= $(strip $(subst ",, $(ADK_TARGET_LINUX_KERNEL_ ADK_TARGET_LINUX_KERNEL_GIT_TYPE:= $(strip $(subst ",, $(ADK_TARGET_LINUX_KERNEL_GIT_TYPE))) ADK_TARGET_LINUX_KERNEL_DEFCONFIG:= $(strip $(subst ",, $(ADK_TARGET_LINUX_KERNEL_DEFCONFIG))) ADK_TARGET_GENIMAGE_FILENAME:= $(strip $(subst ",, $(ADK_TARGET_GENIMAGE_FILENAME))) +ADK_TARGET_EXTLINUX_FILENAME:= $(strip $(subst ",, $(ADK_TARGET_EXTLINUX_FILENAME))) ADK_TARGET_ROOTDEV:= $(strip $(subst ",, $(ADK_TARGET_ROOTDEV))) ADK_TARGET_KARCH:=$(ADK_TARGET_ARCH) diff --git a/scripts/flash-uboot.sh b/scripts/flash-uboot.sh new file mode 100755 index 000000000..e0cfcb340 --- /dev/null +++ b/scripts/flash-uboot.sh @@ -0,0 +1,23 @@ +#!/bin/bash + +OUTPUT_DIR=$1 + +if ! test -d "${OUTPUT_DIR}" ; then + echo "ERROR: no output directory specified." + echo "Usage: $0 OUTPUT_DIR" + echo "" + echo "Arguments:" + echo " OUTPUT_DIR The OpenADK output directory." + exit 1 +fi + +./host_x86_64-linux-gnu/usr/bin/openocd \ + -f interface/stlink.cfg -f board/stm32f7discovery.cfg \ +-c "init" \ +-c "reset init" \ +-c "flash probe 0" \ +-c "flash info 0" \ +-c "flash write_image erase ${OUTPUT_DIR}/u-boot-spl.bin 0x08000000" \ +-c "flash write_image erase ${OUTPUT_DIR}/u-boot-dtb.bin 0x08008000" \ +-c "reset run" \ +-c "shutdown" diff --git a/target/arm/Makefile b/target/arm/Makefile index d92e10d6a..4f7ffc009 100644 --- a/target/arm/Makefile +++ b/target/arm/Makefile @@ -148,9 +148,9 @@ endif endif ifeq ($(ADK_TARGET_FS),genimage) targethelp: - @echo "The disk image is: $(FW_DIR)/disk.img" + @echo "The disk image is: $(FW_DIR)/sdcard.img" @echo "Use following command to install it on SD card:" - @echo 'sudo dd if=$(FW_DIR)/disk.img of=/dev/sdX bs=2048k' + @echo 'sudo dd if=$(FW_DIR)/sdcard.img of=/dev/sdX bs=2048k' endif kernel-strip: @@ -219,6 +219,9 @@ ifeq ($(ADK_TARGET_SYSTEM_ST_STM32F429),y) endif ifeq ($(ADK_TARGET_SYSTEM_ST_STM32F769),y) ${KERNEL_MAKE} dtbs $(MAKE_TRACE) +endif +ifeq ($(ADK_TARGET_SYSTEM_ST_STM32F746G),y) + ${KERNEL_MAKE} dtbs $(MAKE_TRACE) endif for x in $(LINUX_DIR)/arch/arm/boot/dts/*.dtb; do \ [[ -e "$$x" ]] && cp $(LINUX_DIR)/arch/arm/boot/dts/*.dtb $(FW_DIR); \ diff --git a/target/arm/kernel/st-stm32f746g b/target/arm/kernel/st-stm32f746g new file mode 100644 index 000000000..0459ccf8b --- /dev/null +++ b/target/arm/kernel/st-stm32f746g @@ -0,0 +1,31 @@ +CONFIG_ARM_SINGLE_ARMV7M=y +CONFIG_ARCH_STM32=y +CONFIG_MACH_STM32F746=y +CONFIG_SET_MEM_PARAM=y +CONFIG_DRAM_BASE=0xC0000000 +CONFIG_DRAM_SIZE=0x01000000 +CONFIG_FLASH_MEM_BASE=0x08000000 +CONFIG_FLASH_SIZE=0x00200000 +CONFIG_SERIAL_NONSTANDARD=y +CONFIG_SERIAL_STM32=y +CONFIG_SERIAL_STM32_CONSOLE=y +CONFIG_I2C=y +CONFIG_I2C_CHARDEV=y +CONFIG_I2C_STM32F4=y +CONFIG_I2C_STM32F7=y +CONFIG_GPIO_STMPE=y +CONFIG_MFD_STMPE=y +CONFIG_REGULATOR=y +CONFIG_REGULATOR_FIXED_VOLTAGE=y +CONFIG_MMC=y +CONFIG_MMC_BLOCK=y +CONFIG_MMC_ARMMMCI=y +CONFIG_MMC_STM32_SDMMC=y +CONFIG_DMADEVICES=y +CONFIG_STM32_DMA=y +CONFIG_STM32_DMAMUX=y +CONFIG_STM32_MDMA=y +#CONFIG_NET_VENDOR_STMICRO=y +#CONFIG_STMMAC_ETH=y +#CONFIG_STMMAC_PLATFORM=y +#CONFIG_DWMAC_STM32=y diff --git a/target/arm/st-stm32f746g/extlinux.conf b/target/arm/st-stm32f746g/extlinux.conf new file mode 100644 index 000000000..9a6728417 --- /dev/null +++ b/target/arm/st-stm32f746g/extlinux.conf @@ -0,0 +1,4 @@ +label stm32f746g-disco-openadk + kernel /kernel + devicetree /stm32f746-disco.dtb + append console=ttySTM0,115200 root=/dev/mmcblk0p2 rw rootwait consoleblank=0 diff --git a/target/arm/st-stm32f746g/genimage.cfg b/target/arm/st-stm32f746g/genimage.cfg new file mode 100644 index 000000000..79e9e89f0 --- /dev/null +++ b/target/arm/st-stm32f746g/genimage.cfg @@ -0,0 +1,27 @@ +image boot.vfat { + vfat { + files = { + "kernel", + "stm32f746-disco.dtb", + "extlinux" + } + } + + size = 16M +} + +image sdcard.img { + hdimage { + } + + partition boot { + partition-type = 0xC + image = "boot.vfat" + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext" + size = 32M + } +} diff --git a/target/arm/systems/st-stm32f746g b/target/arm/systems/st-stm32f746g new file mode 100644 index 000000000..8bb4be52f --- /dev/null +++ b/target/arm/systems/st-stm32f746g @@ -0,0 +1,17 @@ +config ADK_TARGET_SYSTEM_ST_STM32F746G + bool "STMicroelectronics STM32F746G Disco" + depends on ADK_TARGET_OS_LINUX + select ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_CPU_ARM_CORTEX_M7 + select ADK_TARGET_ARCH_ARM_WITH_THUMB + select ADK_TARGET_WITH_SERIAL + select ADK_TARGET_WITH_VGA + select ADK_TARGET_WITH_NET + select ADK_TARGET_WITH_NETDEVICE + select ADK_TARGET_UCLINUX + select ADK_TARGET_KERNEL_WITH_COMPRESSION + select ADK_TARGET_KERNEL_ZIMAGE + select ADK_HOST_BUILD_OPENOCD + help + STMicroelectronics STM32F746G Disco + diff --git a/target/config/Config.in.kernelfmt b/target/config/Config.in.kernelfmt index 84433dfb1..f64eb32b2 100644 --- a/target/config/Config.in.kernelfmt +++ b/target/config/Config.in.kernelfmt @@ -73,6 +73,7 @@ config ADK_TARGET_KERNEL_LOADADDR default 0x8000 if ADK_TARGET_SYSTEM_SYNOLOGY_DS414 default 0x40008000 if ADK_TARGET_SYSTEM_BANANA_PRO default 0x40008000 if ADK_TARGET_SYSTEM_ORANGE_PI0 + default 0xc0008000 if ADK_TARGET_SYSTEM_ST_STM32F746G config ADK_TARGET_KERNEL_APPEND_DTB string diff --git a/target/config/Config.in.rootfs b/target/config/Config.in.rootfs index 80baf4d02..f51e57e16 100644 --- a/target/config/Config.in.rootfs +++ b/target/config/Config.in.rootfs @@ -167,7 +167,6 @@ config ADK_TARGET_ROOTFS_GENIMAGE select ADK_TARGET_QEMU_WITH_BLOCK if ADK_TARGET_QEMU select ADK_TARGET_QEMU_WITH_BOOTLOADER if ADK_TARGET_QEMU select ADK_HOST_BUILD_GENIMAGE - depends on ADK_TARGET_ARCH_X86_64 help Create a complete disk image for the target with genimage. @@ -199,3 +198,7 @@ config ADK_TARGET_GENIMAGE_FILENAME default "genimage-efi.cfg" if ADK_PACKAGE_GRUB_EFI_X86_64 || ADK_PACKAGE_GRUB_EFI_X86 default "genimage-dual.cfg" if ADK_TARGET_DUAL_BOOT default "genimage.cfg" + +config ADK_TARGET_EXTLINUX_FILENAME + string + default "extlinux.conf" diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime index 18f1d1794..eb349c79a 100644 --- a/target/config/Config.in.runtime +++ b/target/config/Config.in.runtime @@ -374,6 +374,7 @@ config ADK_RUNTIME_CONSOLE_SERIAL_DEVICE default "ttyO2" if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK default "ttyO0" if ADK_TARGET_SYSTEM_PHYTEC_WEGA default "ttyS4" if ADK_TARGET_SYSTEM_IMGTEC_CI20 + default "ttySTM0" if ADK_TARGET_SYSTEM_ST_STM32F746G default "ttyS0" config ADK_RUNTIME_CONSOLE_SERIAL_SPEED diff --git a/target/config/Config.in.tools b/target/config/Config.in.tools index 5cecf85c1..0f20f3afe 100644 --- a/target/config/Config.in.tools +++ b/target/config/Config.in.tools @@ -164,7 +164,6 @@ config ADK_HOST_BUILD_MTOOLS config ADK_HOST_BUILD_GENIMAGE bool - select ADK_HOST_BUILD_MKE2IMG select ADK_HOST_BUILD_MTOOLS select ADK_HOST_BUILD_GENEXT2FS select ADK_HOST_BUILD_GPTFDISK diff --git a/target/linux/Config.in.kernelcfg b/target/linux/Config.in.kernelcfg index 50fff5c5d..5e09b182e 100644 --- a/target/linux/Config.in.kernelcfg +++ b/target/linux/Config.in.kernelcfg @@ -48,6 +48,7 @@ config ADK_TARGET_LINUX_KERNEL_DEFCONFIG default "i386_defconfig" if ADK_TARGET_SYSTEM_GENERIC_X86 default "stm32_defconfig" if ADK_TARGET_SYSTEM_ST_STM32F429 default "stm32_defconfig" if ADK_TARGET_SYSTEM_ST_STM32F769 + default "stm32_defconfig" if ADK_TARGET_SYSTEM_ST_STM32F746G default "nommu_k210_defconfig" if ADK_TARGET_SYSTEM_SIPEED_MAIX_BIT default "loongson3_defconfig" if ADK_TARGET_SYSTEM_QEMU_LOONGARCH default "" diff --git a/target/linux/Config.in.kernelversion b/target/linux/Config.in.kernelversion index 43b34b7b9..6c192a820 100644 --- a/target/linux/Config.in.kernelversion +++ b/target/linux/Config.in.kernelversion @@ -35,7 +35,7 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_GIT select ADK_TARGET_LINUX_KERNEL_IMAGE if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK config ADK_TARGET_LINUX_KERNEL_VERSION_5_19 - bool "5.19" + bool "5.19.9" depends on !ADK_TARGET_ARCH_AVR32 depends on !ADK_TARGET_ARCH_BFIN depends on !ADK_TARGET_ARCH_CRIS @@ -69,7 +69,7 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_5_4 depends on !ADK_TARGET_SYSTEM_SIPEED_MAIX_BIT config ADK_TARGET_LINUX_KERNEL_VERSION_4_19 - bool "4.19.213" + bool "4.19.258" depends on !ADK_TARGET_ARCH_AVR32 depends on !ADK_TARGET_ARCH_BFIN depends on !ADK_TARGET_ARCH_CRIS @@ -80,7 +80,7 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_4_19 depends on !ADK_TARGET_ARCH_RISCV64 config ADK_TARGET_LINUX_KERNEL_VERSION_4_14 - bool "4.14.252" + bool "4.14.293" depends on !ADK_TARGET_ARCH_AVR32 depends on !ADK_TARGET_ARCH_BFIN depends on !ADK_TARGET_ARCH_CRIS diff --git a/target/linux/patches/4.14.252/alpha-remove-coff.patch b/target/linux/patches/4.14.252/alpha-remove-coff.patch deleted file mode 100644 index 51b7bcc14..000000000 --- a/target/linux/patches/4.14.252/alpha-remove-coff.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -Nur linux-4.14.39.orig/arch/alpha/boot/tools/objstrip.c linux-4.14.39/arch/alpha/boot/tools/objstrip.c ---- linux-4.14.39.orig/arch/alpha/boot/tools/objstrip.c 2018-05-01 21:58:27.000000000 +0200 -+++ linux-4.14.39/arch/alpha/boot/tools/objstrip.c 2018-05-22 12:36:55.166124565 +0200 -@@ -192,38 +192,8 @@ - prog_name, (long) elf_phdr->p_vaddr, - elf_phdr->p_vaddr + fil_size, offset); - } -- } else --#endif -- { -- aout = (struct exec *) buf; -- -- if (!(aout->fh.f_flags & COFF_F_EXEC)) { -- fprintf(stderr, "%s: %s is not in executable format\n", -- prog_name, inname); -- exit(1); -- } -- -- if (aout->fh.f_opthdr != sizeof(aout->ah)) { -- fprintf(stderr, "%s: %s has unexpected optional header size\n", -- prog_name, inname); -- exit(1); -- } -- -- if (N_MAGIC(*aout) != OMAGIC) { -- fprintf(stderr, "%s: %s is not an OMAGIC file\n", -- prog_name, inname); -- exit(1); -- } -- offset = N_TXTOFF(*aout); -- fil_size = aout->ah.tsize + aout->ah.dsize; -- mem_size = fil_size + aout->ah.bsize; -- -- if (verbose) { -- fprintf(stderr, "%s: extracting %#016lx-%#016lx (at %lx)\n", -- prog_name, aout->ah.text_start, -- aout->ah.text_start + fil_size, offset); -- } - } -+#endif - - if (lseek(fd, offset, SEEK_SET) != offset) { - perror("lseek"); diff --git a/target/linux/patches/4.14.252/arm-nommu.patch b/target/linux/patches/4.14.252/arm-nommu.patch deleted file mode 100644 index b91aaf712..000000000 --- a/target/linux/patches/4.14.252/arm-nommu.patch +++ /dev/null @@ -1,81 +0,0 @@ -diff -Nur linux-4.14.30.orig/arch/arm/Kconfig linux-4.14.30/arch/arm/Kconfig ---- linux-4.14.30.orig/arch/arm/Kconfig 2018-03-24 11:01:30.000000000 +0100 -+++ linux-4.14.30/arch/arm/Kconfig 2018-04-01 04:14:15.989043313 +0100 -@@ -363,6 +363,17 @@ - select SPARSE_IRQ - select USE_OF - -+config ARM_SINGLE_ARCH_VERSATILE -+ bool "ARM Ltd. Versatile family" -+ depends on !MMU -+ select AUTO_ZRELADDR -+ select CLKSRC_OF -+ select COMMON_CLK -+ select GENERIC_CLOCKEVENTS -+ select GPIOLIB -+ select SPARSE_IRQ -+ select USE_OF -+ - config ARCH_EBSA110 - bool "EBSA-110" - select ARCH_USES_GETTIMEOFFSET -diff -Nur linux-4.14.30.orig/arch/arm/Kconfig.debug linux-4.14.30/arch/arm/Kconfig.debug ---- linux-4.14.30.orig/arch/arm/Kconfig.debug 2018-03-24 11:01:30.000000000 +0100 -+++ linux-4.14.30/arch/arm/Kconfig.debug 2018-04-01 04:14:15.990043300 +0100 -@@ -1777,7 +1777,8 @@ - config UNCOMPRESS_INCLUDE - string - default "debug/uncompress.h" if ARCH_MULTIPLATFORM || ARCH_MSM || \ -- PLAT_SAMSUNG || ARM_SINGLE_ARMV7M -+ PLAT_SAMSUNG || ARM_SINGLE_ARMV7M || \ -+ ARM_SINGLE_ARCH_VERSATILE - default "mach/uncompress.h" - - config EARLY_PRINTK -diff -Nur linux-4.14.30.orig/arch/arm/include/asm/mach/map.h linux-4.14.30/arch/arm/include/asm/mach/map.h ---- linux-4.14.30.orig/arch/arm/include/asm/mach/map.h 2018-03-24 11:01:30.000000000 +0100 -+++ linux-4.14.30/arch/arm/include/asm/mach/map.h 2018-04-01 04:14:15.991043288 +0100 -@@ -62,6 +62,7 @@ - #else - #define iotable_init(map,num) do { } while (0) - #define vm_reserve_area_early(a,s,c) do { } while (0) -+#define debug_ll_io_init() do { } while (0) - #endif - - #endif -diff -Nur linux-4.14.30.orig/arch/arm/mach-versatile/Kconfig linux-4.14.30/arch/arm/mach-versatile/Kconfig ---- linux-4.14.30.orig/arch/arm/mach-versatile/Kconfig 2018-03-24 11:01:30.000000000 +0100 -+++ linux-4.14.30/arch/arm/mach-versatile/Kconfig 2018-04-01 04:14:15.992043275 +0100 -@@ -1,7 +1,8 @@ - # SPDX-License-Identifier: GPL-2.0 - config ARCH_VERSATILE -- bool "ARM Ltd. Versatile family" -- depends on ARCH_MULTI_V5 -+ bool "ARM Ltd. Versatile family" if ARCH_MULTI_V5 -+ depends on ARCH_MULTI_V5 || ARM_SINGLE_ARCH_VERSATILE -+ default y if ARM_SINGLE_ARCH_VERSATILE - select ARM_AMBA - select ARM_TIMER_SP804 - select ARM_VIC -diff -Nur linux-4.14.30.orig/arch/arm/mach-versatile/Makefile.boot linux-4.14.30/arch/arm/mach-versatile/Makefile.boot ---- linux-4.14.30.orig/arch/arm/mach-versatile/Makefile.boot 1970-01-01 01:00:00.000000000 +0100 -+++ linux-4.14.30/arch/arm/mach-versatile/Makefile.boot 2018-04-01 04:14:15.992043275 +0100 -@@ -0,0 +1,3 @@ -+# Empty file waiting for deletion once Makefile.boot isn't needed any more. -+# Patch waits for application at -+# http://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=7889/1 . -diff -Nur linux-4.14.30.orig/arch/arm/mach-versatile/versatile_dt.c linux-4.14.30/arch/arm/mach-versatile/versatile_dt.c ---- linux-4.14.30.orig/arch/arm/mach-versatile/versatile_dt.c 2018-03-24 11:01:30.000000000 +0100 -+++ linux-4.14.30/arch/arm/mach-versatile/versatile_dt.c 2018-04-01 04:14:15.992043275 +0100 -@@ -37,7 +37,11 @@ - #include - - /* macro to get at MMIO space when running virtually */ -+#ifdef CONFIG_MMU - #define IO_ADDRESS(x) (((x) & 0x0fffffff) + (((x) >> 4) & 0x0f000000) + 0xf0000000) -+#else -+#define IO_ADDRESS(x) (x) -+#endif - #define __io_address(n) ((void __iomem __force *)IO_ADDRESS(n)) - - /* diff --git a/target/linux/patches/4.14.252/arm-thumb2.patch b/target/linux/patches/4.14.252/arm-thumb2.patch deleted file mode 100644 index d8d1f4984..000000000 --- a/target/linux/patches/4.14.252/arm-thumb2.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -Nur linux-4.14.34.orig/arch/arm/include/asm/assembler.h linux-4.14.34/arch/arm/include/asm/assembler.h ---- linux-4.14.34.orig/arch/arm/include/asm/assembler.h 2018-04-12 11:32:27.000000000 +0100 -+++ linux-4.14.34/arch/arm/include/asm/assembler.h 2018-04-21 17:29:06.424606334 +0100 -@@ -194,10 +194,9 @@ - */ - .irp c,,eq,ne,cs,cc,mi,pl,vs,vc,hi,ls,ge,lt,gt,le,hs,lo - .macro badr\c, rd, sym --#ifdef CONFIG_THUMB2_KERNEL -- adr\c \rd, \sym + 1 --#else - adr\c \rd, \sym -+#ifdef CONFIG_THUMB2_KERNEL -+ orr\c \rd, \rd, 1 - #endif - .endm - .endr diff --git a/target/linux/patches/4.14.252/h8300.patch b/target/linux/patches/4.14.252/h8300.patch deleted file mode 100644 index 836a414e5..000000000 --- a/target/linux/patches/4.14.252/h8300.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur linux-4.13.2.orig/arch/h8300/Kconfig.cpu linux-4.13.2/arch/h8300/Kconfig.cpu ---- linux-4.13.2.orig/arch/h8300/Kconfig.cpu 2017-09-13 23:21:49.000000000 +0200 -+++ linux-4.13.2/arch/h8300/Kconfig.cpu 2017-09-16 18:32:15.263759679 +0200 -@@ -96,4 +96,8 @@ - hex "Load offset" - default 0 - -+config RAMBASE -+ hex "RAM base address" -+ default 0x400000 -+ - endmenu diff --git a/target/linux/patches/4.14.252/initramfs-nosizelimit.patch b/target/linux/patches/4.14.252/initramfs-nosizelimit.patch deleted file mode 100644 index 0e524c1d9..000000000 --- a/target/linux/patches/4.14.252/initramfs-nosizelimit.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Nur linux-4.14.24.orig/init/do_mounts.c linux-4.14.24/init/do_mounts.c ---- linux-4.14.24.orig/init/do_mounts.c 2018-03-03 10:24:39.000000000 +0100 -+++ linux-4.14.24/init/do_mounts.c 2018-03-08 02:32:01.136927457 +0100 -@@ -604,6 +604,7 @@ - } - - static bool is_tmpfs; -+static char tmpfs_rootflags[] = "nr_blocks=0,nr_inodes=0"; - static struct dentry *rootfs_mount(struct file_system_type *fs_type, - int flags, const char *dev_name, void *data) - { -@@ -616,6 +617,9 @@ - if (IS_ENABLED(CONFIG_TMPFS) && is_tmpfs) - fill = shmem_fill_super; - -+ if (is_tmpfs) -+ data = tmpfs_rootflags; -+ - return mount_nodev(fs_type, flags, data, fill); - } - diff --git a/target/linux/patches/4.14.252/microblaze-sigaltstack.patch b/target/linux/patches/4.14.252/microblaze-sigaltstack.patch deleted file mode 100644 index 80413890a..000000000 --- a/target/linux/patches/4.14.252/microblaze-sigaltstack.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur linux-4.14.39.orig/arch/microblaze/kernel/syscall_table.S linux-4.14.39/arch/microblaze/kernel/syscall_table.S ---- linux-4.14.39.orig/arch/microblaze/kernel/syscall_table.S 2018-05-01 21:58:27.000000000 +0200 -+++ linux-4.14.39/arch/microblaze/kernel/syscall_table.S 2018-05-06 21:16:14.830349827 +0200 -@@ -187,7 +187,7 @@ - .long sys_getcwd - .long sys_capget - .long sys_capset /* 185 */ -- .long sys_ni_syscall /* sigaltstack */ -+ .long sys_sigaltstack - .long sys_sendfile - .long sys_ni_syscall /* reserved for streams1 */ - .long sys_ni_syscall /* reserved for streams2 */ diff --git a/target/linux/patches/4.14.252/or1k-more-ram.patch b/target/linux/patches/4.14.252/or1k-more-ram.patch deleted file mode 100644 index de848c838..000000000 --- a/target/linux/patches/4.14.252/or1k-more-ram.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur linux-4.8.11.orig/arch/openrisc/boot/dts/or1ksim.dts linux-4.8.11/arch/openrisc/boot/dts/or1ksim.dts ---- linux-4.8.11.orig/arch/openrisc/boot/dts/or1ksim.dts 2016-11-26 09:57:13.000000000 +0100 -+++ linux-4.8.11/arch/openrisc/boot/dts/or1ksim.dts 2016-12-04 14:39:46.092952799 +0100 -@@ -11,7 +11,7 @@ - - memory@0 { - device_type = "memory"; -- reg = <0x00000000 0x02000000>; -+ reg = <0x00000000 0x04000000>; - }; - - cpus { diff --git a/target/linux/patches/4.14.252/startup.patch b/target/linux/patches/4.14.252/startup.patch deleted file mode 100644 index f52660a95..000000000 --- a/target/linux/patches/4.14.252/startup.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -Nur linux-4.14.24.orig/init/initramfs.c linux-4.14.24/init/initramfs.c ---- linux-4.14.24.orig/init/initramfs.c 2018-03-03 10:24:39.000000000 +0100 -+++ linux-4.14.24/init/initramfs.c 2018-03-08 06:51:14.808479805 +0100 -@@ -659,6 +659,9 @@ - * us a chance to load before device_initcalls. - */ - load_default_modules(); -+#ifdef CONFIG_DEVTMPFS_MOUNT -+ devtmpfs_mount("dev"); -+#endif - - return 0; - } -diff -Nur linux-4.14.24.orig/init/main.c linux-4.14.24/init/main.c ---- linux-4.14.24.orig/init/main.c 2018-03-03 10:24:39.000000000 +0100 -+++ linux-4.14.24/init/main.c 2018-03-08 06:15:19.961419100 +0100 -@@ -1069,6 +1069,8 @@ - if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0) - pr_err("Warning: unable to open an initial console.\n"); - -+ printk(KERN_WARNING "Starting Linux (built with OpenADK).\n"); -+ - (void) sys_dup(0); - (void) sys_dup(0); - /* diff --git a/target/linux/patches/4.14.252/vdso2.patch b/target/linux/patches/4.14.252/vdso2.patch deleted file mode 100644 index b6c32f31b..000000000 --- a/target/linux/patches/4.14.252/vdso2.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -Nur linux-4.14.44.orig/arch/x86/entry/vdso/vdso2c.c linux-4.14.44/arch/x86/entry/vdso/vdso2c.c ---- linux-4.14.44.orig/arch/x86/entry/vdso/vdso2c.c 2018-05-25 16:18:02.000000000 +0200 -+++ linux-4.14.44/arch/x86/entry/vdso/vdso2c.c 2018-05-31 02:09:00.000000000 +0200 -@@ -64,7 +64,15 @@ - #include - - #include -+#ifdef __linux__ - #include -+#else -+typedef _Bool bool; -+enum { -+ false = 0, -+ true = 1 -+}; -+#endif - - const char *outfilename; - -@@ -86,6 +94,7 @@ - sym_hvclock_page, - }; - -+ - struct vdso_sym { - const char *name; - bool export; diff --git a/target/linux/patches/4.14.293/alpha-remove-coff.patch b/target/linux/patches/4.14.293/alpha-remove-coff.patch new file mode 100644 index 000000000..51b7bcc14 --- /dev/null +++ b/target/linux/patches/4.14.293/alpha-remove-coff.patch @@ -0,0 +1,43 @@ +diff -Nur linux-4.14.39.orig/arch/alpha/boot/tools/objstrip.c linux-4.14.39/arch/alpha/boot/tools/objstrip.c +--- linux-4.14.39.orig/arch/alpha/boot/tools/objstrip.c 2018-05-01 21:58:27.000000000 +0200 ++++ linux-4.14.39/arch/alpha/boot/tools/objstrip.c 2018-05-22 12:36:55.166124565 +0200 +@@ -192,38 +192,8 @@ + prog_name, (long) elf_phdr->p_vaddr, + elf_phdr->p_vaddr + fil_size, offset); + } +- } else +-#endif +- { +- aout = (struct exec *) buf; +- +- if (!(aout->fh.f_flags & COFF_F_EXEC)) { +- fprintf(stderr, "%s: %s is not in executable format\n", +- prog_name, inname); +- exit(1); +- } +- +- if (aout->fh.f_opthdr != sizeof(aout->ah)) { +- fprintf(stderr, "%s: %s has unexpected optional header size\n", +- prog_name, inname); +- exit(1); +- } +- +- if (N_MAGIC(*aout) != OMAGIC) { +- fprintf(stderr, "%s: %s is not an OMAGIC file\n", +- prog_name, inname); +- exit(1); +- } +- offset = N_TXTOFF(*aout); +- fil_size = aout->ah.tsize + aout->ah.dsize; +- mem_size = fil_size + aout->ah.bsize; +- +- if (verbose) { +- fprintf(stderr, "%s: extracting %#016lx-%#016lx (at %lx)\n", +- prog_name, aout->ah.text_start, +- aout->ah.text_start + fil_size, offset); +- } + } ++#endif + + if (lseek(fd, offset, SEEK_SET) != offset) { + perror("lseek"); diff --git a/target/linux/patches/4.14.293/arm-nommu.patch b/target/linux/patches/4.14.293/arm-nommu.patch new file mode 100644 index 000000000..b91aaf712 --- /dev/null +++ b/target/linux/patches/4.14.293/arm-nommu.patch @@ -0,0 +1,81 @@ +diff -Nur linux-4.14.30.orig/arch/arm/Kconfig linux-4.14.30/arch/arm/Kconfig +--- linux-4.14.30.orig/arch/arm/Kconfig 2018-03-24 11:01:30.000000000 +0100 ++++ linux-4.14.30/arch/arm/Kconfig 2018-04-01 04:14:15.989043313 +0100 +@@ -363,6 +363,17 @@ + select SPARSE_IRQ + select USE_OF + ++config ARM_SINGLE_ARCH_VERSATILE ++ bool "ARM Ltd. Versatile family" ++ depends on !MMU ++ select AUTO_ZRELADDR ++ select CLKSRC_OF ++ select COMMON_CLK ++ select GENERIC_CLOCKEVENTS ++ select GPIOLIB ++ select SPARSE_IRQ ++ select USE_OF ++ + config ARCH_EBSA110 + bool "EBSA-110" + select ARCH_USES_GETTIMEOFFSET +diff -Nur linux-4.14.30.orig/arch/arm/Kconfig.debug linux-4.14.30/arch/arm/Kconfig.debug +--- linux-4.14.30.orig/arch/arm/Kconfig.debug 2018-03-24 11:01:30.000000000 +0100 ++++ linux-4.14.30/arch/arm/Kconfig.debug 2018-04-01 04:14:15.990043300 +0100 +@@ -1777,7 +1777,8 @@ + config UNCOMPRESS_INCLUDE + string + default "debug/uncompress.h" if ARCH_MULTIPLATFORM || ARCH_MSM || \ +- PLAT_SAMSUNG || ARM_SINGLE_ARMV7M ++ PLAT_SAMSUNG || ARM_SINGLE_ARMV7M || \ ++ ARM_SINGLE_ARCH_VERSATILE + default "mach/uncompress.h" + + config EARLY_PRINTK +diff -Nur linux-4.14.30.orig/arch/arm/include/asm/mach/map.h linux-4.14.30/arch/arm/include/asm/mach/map.h +--- linux-4.14.30.orig/arch/arm/include/asm/mach/map.h 2018-03-24 11:01:30.000000000 +0100 ++++ linux-4.14.30/arch/arm/include/asm/mach/map.h 2018-04-01 04:14:15.991043288 +0100 +@@ -62,6 +62,7 @@ + #else + #define iotable_init(map,num) do { } while (0) + #define vm_reserve_area_early(a,s,c) do { } while (0) ++#define debug_ll_io_init() do { } while (0) + #endif + + #endif +diff -Nur linux-4.14.30.orig/arch/arm/mach-versatile/Kconfig linux-4.14.30/arch/arm/mach-versatile/Kconfig +--- linux-4.14.30.orig/arch/arm/mach-versatile/Kconfig 2018-03-24 11:01:30.000000000 +0100 ++++ linux-4.14.30/arch/arm/mach-versatile/Kconfig 2018-04-01 04:14:15.992043275 +0100 +@@ -1,7 +1,8 @@ + # SPDX-License-Identifier: GPL-2.0 + config ARCH_VERSATILE +- bool "ARM Ltd. Versatile family" +- depends on ARCH_MULTI_V5 ++ bool "ARM Ltd. Versatile family" if ARCH_MULTI_V5 ++ depends on ARCH_MULTI_V5 || ARM_SINGLE_ARCH_VERSATILE ++ default y if ARM_SINGLE_ARCH_VERSATILE + select ARM_AMBA + select ARM_TIMER_SP804 + select ARM_VIC +diff -Nur linux-4.14.30.orig/arch/arm/mach-versatile/Makefile.boot linux-4.14.30/arch/arm/mach-versatile/Makefile.boot +--- linux-4.14.30.orig/arch/arm/mach-versatile/Makefile.boot 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.14.30/arch/arm/mach-versatile/Makefile.boot 2018-04-01 04:14:15.992043275 +0100 +@@ -0,0 +1,3 @@ ++# Empty file waiting for deletion once Makefile.boot isn't needed any more. ++# Patch waits for application at ++# http://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=7889/1 . +diff -Nur linux-4.14.30.orig/arch/arm/mach-versatile/versatile_dt.c linux-4.14.30/arch/arm/mach-versatile/versatile_dt.c +--- linux-4.14.30.orig/arch/arm/mach-versatile/versatile_dt.c 2018-03-24 11:01:30.000000000 +0100 ++++ linux-4.14.30/arch/arm/mach-versatile/versatile_dt.c 2018-04-01 04:14:15.992043275 +0100 +@@ -37,7 +37,11 @@ + #include + + /* macro to get at MMIO space when running virtually */ ++#ifdef CONFIG_MMU + #define IO_ADDRESS(x) (((x) & 0x0fffffff) + (((x) >> 4) & 0x0f000000) + 0xf0000000) ++#else ++#define IO_ADDRESS(x) (x) ++#endif + #define __io_address(n) ((void __iomem __force *)IO_ADDRESS(n)) + + /* diff --git a/target/linux/patches/4.14.293/arm-thumb2.patch b/target/linux/patches/4.14.293/arm-thumb2.patch new file mode 100644 index 000000000..d8d1f4984 --- /dev/null +++ b/target/linux/patches/4.14.293/arm-thumb2.patch @@ -0,0 +1,16 @@ +diff -Nur linux-4.14.34.orig/arch/arm/include/asm/assembler.h linux-4.14.34/arch/arm/include/asm/assembler.h +--- linux-4.14.34.orig/arch/arm/include/asm/assembler.h 2018-04-12 11:32:27.000000000 +0100 ++++ linux-4.14.34/arch/arm/include/asm/assembler.h 2018-04-21 17:29:06.424606334 +0100 +@@ -194,10 +194,9 @@ + */ + .irp c,,eq,ne,cs,cc,mi,pl,vs,vc,hi,ls,ge,lt,gt,le,hs,lo + .macro badr\c, rd, sym +-#ifdef CONFIG_THUMB2_KERNEL +- adr\c \rd, \sym + 1 +-#else + adr\c \rd, \sym ++#ifdef CONFIG_THUMB2_KERNEL ++ orr\c \rd, \rd, 1 + #endif + .endm + .endr diff --git a/target/linux/patches/4.14.293/h8300.patch b/target/linux/patches/4.14.293/h8300.patch new file mode 100644 index 000000000..836a414e5 --- /dev/null +++ b/target/linux/patches/4.14.293/h8300.patch @@ -0,0 +1,12 @@ +diff -Nur linux-4.13.2.orig/arch/h8300/Kconfig.cpu linux-4.13.2/arch/h8300/Kconfig.cpu +--- linux-4.13.2.orig/arch/h8300/Kconfig.cpu 2017-09-13 23:21:49.000000000 +0200 ++++ linux-4.13.2/arch/h8300/Kconfig.cpu 2017-09-16 18:32:15.263759679 +0200 +@@ -96,4 +96,8 @@ + hex "Load offset" + default 0 + ++config RAMBASE ++ hex "RAM base address" ++ default 0x400000 ++ + endmenu diff --git a/target/linux/patches/4.14.293/initramfs-nosizelimit.patch b/target/linux/patches/4.14.293/initramfs-nosizelimit.patch new file mode 100644 index 000000000..0e524c1d9 --- /dev/null +++ b/target/linux/patches/4.14.293/initramfs-nosizelimit.patch @@ -0,0 +1,21 @@ +diff -Nur linux-4.14.24.orig/init/do_mounts.c linux-4.14.24/init/do_mounts.c +--- linux-4.14.24.orig/init/do_mounts.c 2018-03-03 10:24:39.000000000 +0100 ++++ linux-4.14.24/init/do_mounts.c 2018-03-08 02:32:01.136927457 +0100 +@@ -604,6 +604,7 @@ + } + + static bool is_tmpfs; ++static char tmpfs_rootflags[] = "nr_blocks=0,nr_inodes=0"; + static struct dentry *rootfs_mount(struct file_system_type *fs_type, + int flags, const char *dev_name, void *data) + { +@@ -616,6 +617,9 @@ + if (IS_ENABLED(CONFIG_TMPFS) && is_tmpfs) + fill = shmem_fill_super; + ++ if (is_tmpfs) ++ data = tmpfs_rootflags; ++ + return mount_nodev(fs_type, flags, data, fill); + } + diff --git a/target/linux/patches/4.14.293/microblaze-sigaltstack.patch b/target/linux/patches/4.14.293/microblaze-sigaltstack.patch new file mode 100644 index 000000000..80413890a --- /dev/null +++ b/target/linux/patches/4.14.293/microblaze-sigaltstack.patch @@ -0,0 +1,12 @@ +diff -Nur linux-4.14.39.orig/arch/microblaze/kernel/syscall_table.S linux-4.14.39/arch/microblaze/kernel/syscall_table.S +--- linux-4.14.39.orig/arch/microblaze/kernel/syscall_table.S 2018-05-01 21:58:27.000000000 +0200 ++++ linux-4.14.39/arch/microblaze/kernel/syscall_table.S 2018-05-06 21:16:14.830349827 +0200 +@@ -187,7 +187,7 @@ + .long sys_getcwd + .long sys_capget + .long sys_capset /* 185 */ +- .long sys_ni_syscall /* sigaltstack */ ++ .long sys_sigaltstack + .long sys_sendfile + .long sys_ni_syscall /* reserved for streams1 */ + .long sys_ni_syscall /* reserved for streams2 */ diff --git a/target/linux/patches/4.14.293/or1k-more-ram.patch b/target/linux/patches/4.14.293/or1k-more-ram.patch new file mode 100644 index 000000000..de848c838 --- /dev/null +++ b/target/linux/patches/4.14.293/or1k-more-ram.patch @@ -0,0 +1,12 @@ +diff -Nur linux-4.8.11.orig/arch/openrisc/boot/dts/or1ksim.dts linux-4.8.11/arch/openrisc/boot/dts/or1ksim.dts +--- linux-4.8.11.orig/arch/openrisc/boot/dts/or1ksim.dts 2016-11-26 09:57:13.000000000 +0100 ++++ linux-4.8.11/arch/openrisc/boot/dts/or1ksim.dts 2016-12-04 14:39:46.092952799 +0100 +@@ -11,7 +11,7 @@ + + memory@0 { + device_type = "memory"; +- reg = <0x00000000 0x02000000>; ++ reg = <0x00000000 0x04000000>; + }; + + cpus { diff --git a/target/linux/patches/4.14.293/startup.patch b/target/linux/patches/4.14.293/startup.patch new file mode 100644 index 000000000..f52660a95 --- /dev/null +++ b/target/linux/patches/4.14.293/startup.patch @@ -0,0 +1,25 @@ +diff -Nur linux-4.14.24.orig/init/initramfs.c linux-4.14.24/init/initramfs.c +--- linux-4.14.24.orig/init/initramfs.c 2018-03-03 10:24:39.000000000 +0100 ++++ linux-4.14.24/init/initramfs.c 2018-03-08 06:51:14.808479805 +0100 +@@ -659,6 +659,9 @@ + * us a chance to load before device_initcalls. + */ + load_default_modules(); ++#ifdef CONFIG_DEVTMPFS_MOUNT ++ devtmpfs_mount("dev"); ++#endif + + return 0; + } +diff -Nur linux-4.14.24.orig/init/main.c linux-4.14.24/init/main.c +--- linux-4.14.24.orig/init/main.c 2018-03-03 10:24:39.000000000 +0100 ++++ linux-4.14.24/init/main.c 2018-03-08 06:15:19.961419100 +0100 +@@ -1069,6 +1069,8 @@ + if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0) + pr_err("Warning: unable to open an initial console.\n"); + ++ printk(KERN_WARNING "Starting Linux (built with OpenADK).\n"); ++ + (void) sys_dup(0); + (void) sys_dup(0); + /* diff --git a/target/linux/patches/4.14.293/vdso2.patch b/target/linux/patches/4.14.293/vdso2.patch new file mode 100644 index 000000000..b6c32f31b --- /dev/null +++ b/target/linux/patches/4.14.293/vdso2.patch @@ -0,0 +1,27 @@ +diff -Nur linux-4.14.44.orig/arch/x86/entry/vdso/vdso2c.c linux-4.14.44/arch/x86/entry/vdso/vdso2c.c +--- linux-4.14.44.orig/arch/x86/entry/vdso/vdso2c.c 2018-05-25 16:18:02.000000000 +0200 ++++ linux-4.14.44/arch/x86/entry/vdso/vdso2c.c 2018-05-31 02:09:00.000000000 +0200 +@@ -64,7 +64,15 @@ + #include + + #include ++#ifdef __linux__ + #include ++#else ++typedef _Bool bool; ++enum { ++ false = 0, ++ true = 1 ++}; ++#endif + + const char *outfilename; + +@@ -86,6 +94,7 @@ + sym_hvclock_page, + }; + ++ + struct vdso_sym { + const char *name; + bool export; diff --git a/target/linux/patches/4.19.213/arc.patch b/target/linux/patches/4.19.213/arc.patch deleted file mode 100644 index 20810ce64..000000000 --- a/target/linux/patches/4.19.213/arc.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur linux-4.17.1.orig/arch/arc/boot/Makefile linux-4.17.1/arch/arc/boot/Makefile ---- linux-4.17.1.orig/arch/arc/boot/Makefile 2018-06-11 22:43:19.000000000 +0200 -+++ linux-4.17.1/arch/arc/boot/Makefile 2018-06-16 18:28:02.000000000 +0200 -@@ -7,7 +7,7 @@ - - OBJCOPYFLAGS= -O binary -R .note -R .note.gnu.build-id -R .comment -S - --LINUX_START_TEXT = $$(readelf -h vmlinux | \ -+LINUX_START_TEXT = $$(${CROSS_COMPILE}readelf -h vmlinux | \ - grep "Entry point address" | grep -o 0x.*) - - UIMAGE_LOADADDR = $(CONFIG_LINUX_LINK_BASE) diff --git a/target/linux/patches/4.19.213/arm-nommu.patch b/target/linux/patches/4.19.213/arm-nommu.patch deleted file mode 100644 index d23d3f4eb..000000000 --- a/target/linux/patches/4.19.213/arm-nommu.patch +++ /dev/null @@ -1,81 +0,0 @@ -diff -Nur linux-4.19.213.orig/arch/arm/include/asm/mach/map.h linux-4.19.213/arch/arm/include/asm/mach/map.h ---- linux-4.19.213.orig/arch/arm/include/asm/mach/map.h 2021-10-20 11:23:05.000000000 +0200 -+++ linux-4.19.213/arch/arm/include/asm/mach/map.h 2021-10-26 09:16:01.660445624 +0200 -@@ -62,6 +62,7 @@ - #else - #define iotable_init(map,num) do { } while (0) - #define vm_reserve_area_early(a,s,c) do { } while (0) -+#define debug_ll_io_init() do { } while (0) - #endif - - #endif -diff -Nur linux-4.19.213.orig/arch/arm/Kconfig linux-4.19.213/arch/arm/Kconfig ---- linux-4.19.213.orig/arch/arm/Kconfig 2021-10-20 11:23:05.000000000 +0200 -+++ linux-4.19.213/arch/arm/Kconfig 2021-10-26 09:16:01.656445624 +0200 -@@ -353,6 +353,17 @@ - select SPARSE_IRQ - select USE_OF - -+config ARM_SINGLE_ARCH_VERSATILE -+ bool "ARM Ltd. Versatile family" -+ depends on !MMU -+ select AUTO_ZRELADDR -+ select CLKSRC_OF -+ select COMMON_CLK -+ select GENERIC_CLOCKEVENTS -+ select GPIOLIB -+ select SPARSE_IRQ -+ select USE_OF -+ - config ARCH_EBSA110 - bool "EBSA-110" - select ARCH_USES_GETTIMEOFFSET -diff -Nur linux-4.19.213.orig/arch/arm/Kconfig.debug linux-4.19.213/arch/arm/Kconfig.debug ---- linux-4.19.213.orig/arch/arm/Kconfig.debug 2021-10-20 11:23:05.000000000 +0200 -+++ linux-4.19.213/arch/arm/Kconfig.debug 2021-10-26 09:16:01.660445624 +0200 -@@ -1852,7 +1852,8 @@ - config UNCOMPRESS_INCLUDE - string - default "debug/uncompress.h" if ARCH_MULTIPLATFORM || ARCH_MSM || \ -- PLAT_SAMSUNG || ARM_SINGLE_ARMV7M -+ PLAT_SAMSUNG || ARM_SINGLE_ARMV7M || \ -+ ARM_SINGLE_ARCH_VERSATILE - default "mach/uncompress.h" - - config EARLY_PRINTK -diff -Nur linux-4.19.213.orig/arch/arm/mach-versatile/Kconfig linux-4.19.213/arch/arm/mach-versatile/Kconfig ---- linux-4.19.213.orig/arch/arm/mach-versatile/Kconfig 2021-10-20 11:23:05.000000000 +0200 -+++ linux-4.19.213/arch/arm/mach-versatile/Kconfig 2021-10-26 09:16:01.660445624 +0200 -@@ -1,7 +1,8 @@ - # SPDX-License-Identifier: GPL-2.0 - config ARCH_VERSATILE -- bool "ARM Ltd. Versatile family" -- depends on ARCH_MULTI_V5 -+ bool "ARM Ltd. Versatile family" if ARCH_MULTI_V5 -+ depends on ARCH_MULTI_V5 || ARM_SINGLE_ARCH_VERSATILE -+ default y if ARM_SINGLE_ARCH_VERSATILE - select ARM_AMBA - select ARM_TIMER_SP804 - select ARM_VIC -diff -Nur linux-4.19.213.orig/arch/arm/mach-versatile/Makefile.boot linux-4.19.213/arch/arm/mach-versatile/Makefile.boot ---- linux-4.19.213.orig/arch/arm/mach-versatile/Makefile.boot 1970-01-01 01:00:00.000000000 +0100 -+++ linux-4.19.213/arch/arm/mach-versatile/Makefile.boot 2021-10-26 09:16:01.660445624 +0200 -@@ -0,0 +1,3 @@ -+# Empty file waiting for deletion once Makefile.boot isn't needed any more. -+# Patch waits for application at -+# http://www.arm.linux.org.uk/developer/patches/viewpatch.php?id=7889/1 . -diff -Nur linux-4.19.213.orig/arch/arm/mach-versatile/versatile_dt.c linux-4.19.213/arch/arm/mach-versatile/versatile_dt.c ---- linux-4.19.213.orig/arch/arm/mach-versatile/versatile_dt.c 2021-10-20 11:23:05.000000000 +0200 -+++ linux-4.19.213/arch/arm/mach-versatile/versatile_dt.c 2021-10-26 09:16:01.660445624 +0200 -@@ -37,7 +37,11 @@ - #include - - /* macro to get at MMIO space when running virtually */ -+#ifdef CONFIG_MMU - #define IO_ADDRESS(x) (((x) & 0x0fffffff) + (((x) >> 4) & 0x0f000000) + 0xf0000000) -+#else -+#define IO_ADDRESS(x) (x) -+#endif - #define __io_address(n) ((void __iomem __force *)IO_ADDRESS(n)) - - /* diff --git a/target/linux/patches/4.19.213/darwin-dtc.patch b/target/linux/patches/4.19.213/darwin-dtc.patch deleted file mode 100644 index 0cdc23ab4..000000000 --- a/target/linux/patches/4.19.213/darwin-dtc.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -Nur linux-4.19.132.orig/scripts/dtc/dtc.h linux-4.19.132/scripts/dtc/dtc.h ---- linux-4.19.132.orig/scripts/dtc/dtc.h 2020-07-09 09:37:13.000000000 +0200 -+++ linux-4.19.132/scripts/dtc/dtc.h 2020-07-15 02:38:00.000000000 +0200 -@@ -33,8 +33,8 @@ - #include - #include - --#include --#include -+#include "libfdt/libfdt_env.h" -+#include "libfdt/fdt.h" - - #include "util.h" - -diff -Nur linux-4.19.132.orig/scripts/dtc/util.c linux-4.19.132/scripts/dtc/util.c ---- linux-4.19.132.orig/scripts/dtc/util.c 2020-07-09 09:37:13.000000000 +0200 -+++ linux-4.19.132/scripts/dtc/util.c 2020-07-15 02:38:18.000000000 +0200 -@@ -32,7 +32,7 @@ - #include - #include - --#include "libfdt.h" -+#include "libfdt/libfdt.h" - #include "util.h" - #include "version_gen.h" - diff --git a/target/linux/patches/4.19.213/darwin-file2alias.patch b/target/linux/patches/4.19.213/darwin-file2alias.patch deleted file mode 100644 index fdbc598a8..000000000 --- a/target/linux/patches/4.19.213/darwin-file2alias.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Nur linux-5.4.42.orig/scripts/mod/file2alias.c linux-5.4.42/scripts/mod/file2alias.c ---- linux-5.4.42.orig/scripts/mod/file2alias.c 2020-05-20 08:20:41.000000000 +0200 -+++ linux-5.4.42/scripts/mod/file2alias.c 2020-06-06 20:14:59.000000000 +0200 -@@ -10,6 +10,10 @@ - * of the GNU General Public License, incorporated herein by reference. - */ - -+/* workaround for Darwin */ -+#define _UUID_T -+#define __GETHOSTUUID_H -+ - #include "modpost.h" - #include "devicetable-offsets.h" - diff --git a/target/linux/patches/4.19.213/fec-coldfire.patch b/target/linux/patches/4.19.213/fec-coldfire.patch deleted file mode 100644 index 09d8ad047..000000000 --- a/target/linux/patches/4.19.213/fec-coldfire.patch +++ /dev/null @@ -1,118 +0,0 @@ -diff -Nur linux-4.19.75.orig/drivers/net/ethernet/freescale/fec_main.c linux-4.19.75/drivers/net/ethernet/freescale/fec_main.c ---- linux-4.19.75.orig/drivers/net/ethernet/freescale/fec_main.c 2019-09-21 07:17:15.000000000 +0200 -+++ linux-4.19.75/drivers/net/ethernet/freescale/fec_main.c 2019-10-10 01:17:45.284188283 +0200 -@@ -156,7 +156,7 @@ - module_param_array(macaddr, byte, NULL, 0); - MODULE_PARM_DESC(macaddr, "FEC Ethernet MAC address"); - --#if defined(CONFIG_M5272) -+#if defined(CONFIG_COLDFIRE) - /* - * Some hardware gets it MAC address out of local flash memory. - * if this is non-zero then assume it is the address to get MAC from. -@@ -174,7 +174,7 @@ - #else - #define FEC_FLASHMAC 0 - #endif --#endif /* CONFIG_M5272 */ -+#endif /* CONFIG_COLDFIRE */ - - /* The FEC stores dest/src/type/vlan, data, and checksum for receive packets. - * -@@ -958,7 +958,7 @@ - /* Set MII speed */ - writel(fep->phy_speed, fep->hwp + FEC_MII_SPEED); - --#if !defined(CONFIG_M5272) -+#if !defined(CONFIG_COLDFIRE) - if (fep->quirks & FEC_QUIRK_HAS_RACC) { - val = readl(fep->hwp + FEC_RACC); - /* align IP header */ -@@ -1027,7 +1027,7 @@ - #endif - } - --#if !defined(CONFIG_M5272) -+#if !defined(CONFIG_COLDFIRE) - /* enable pause frame*/ - if ((fep->pause_flag & FEC_PAUSE_FLAG_ENABLE) || - ((fep->pause_flag & FEC_PAUSE_FLAG_AUTONEG) && -@@ -1045,13 +1045,13 @@ - } else { - rcntl &= ~FEC_ENET_FCE; - } --#endif /* !defined(CONFIG_M5272) */ -+#endif /* !defined(CONFIG_COLDFIRE) */ - - writel(rcntl, fep->hwp + FEC_R_CNTRL); - - /* Setup multicast filter. */ - set_multicast_list(ndev); --#ifndef CONFIG_M5272 -+#ifndef CONFIG_COLDFIRE - writel(0, fep->hwp + FEC_HASH_TABLE_HIGH); - writel(0, fep->hwp + FEC_HASH_TABLE_LOW); - #endif -@@ -1066,7 +1066,7 @@ - if (fep->bufdesc_ex) - ecntl |= (1 << 4); - --#ifndef CONFIG_M5272 -+#ifndef CONFIG_COLDFIRE - /* Enable the MIB statistic event counters */ - writel(0 << 31, fep->hwp + FEC_MIB_CTRLSTAT); - #endif -@@ -1664,7 +1664,7 @@ - * 3) from flash or fuse (via platform data) - */ - if (!is_valid_ether_addr(iap)) { --#ifdef CONFIG_M5272 -+#ifdef CONFIG_COLDFIRE - if (FEC_FLASHMAC) - iap = (unsigned char *)FEC_FLASHMAC; - #else -@@ -1943,7 +1943,7 @@ - if (fep->quirks & FEC_QUIRK_HAS_GBIT) { - phy_dev->supported &= PHY_GBIT_FEATURES; - phy_dev->supported &= ~SUPPORTED_1000baseT_Half; --#if !defined(CONFIG_M5272) -+#if !defined(CONFIG_COLDFIRE) - phy_dev->supported |= SUPPORTED_Pause; - #endif - } -@@ -2199,7 +2199,7 @@ - } - } - --#if !defined(CONFIG_M5272) -+#if !defined(CONFIG_COLDFIRE) - - static void fec_enet_get_pauseparam(struct net_device *ndev, - struct ethtool_pauseparam *pause) -@@ -2391,7 +2391,7 @@ - static inline void fec_enet_clear_ethtool_stats(struct net_device *dev) - { - } --#endif /* !defined(CONFIG_M5272) */ -+#endif /* !defined(CONFIG_COLDFIRE) */ - - /* ITR clock source is enet system clock (clk_ahb). - * TCTT unit is cycle_ns * 64 cycle -@@ -2596,7 +2596,7 @@ - .get_link = ethtool_op_get_link, - .get_coalesce = fec_enet_get_coalesce, - .set_coalesce = fec_enet_set_coalesce, --#ifndef CONFIG_M5272 -+#ifndef CONFIG_COLDFIRE - .get_pauseparam = fec_enet_get_pauseparam, - .set_pauseparam = fec_enet_set_pauseparam, - .get_strings = fec_enet_get_strings, -@@ -3385,7 +3385,7 @@ - fep->num_rx_queues = num_rx_qs; - fep->num_tx_queues = num_tx_qs; - --#if !defined(CONFIG_M5272) -+#if !defined(CONFIG_COLDFIRE) - /* default enable pause frame auto negotiation */ - if (fep->quirks & FEC_QUIRK_HAS_GBIT) - fep->pause_flag |= FEC_PAUSE_FLAG_AUTONEG; diff --git a/target/linux/patches/4.19.213/or1k-more-ram.patch b/target/linux/patches/4.19.213/or1k-more-ram.patch deleted file mode 100644 index de848c838..000000000 --- a/target/linux/patches/4.19.213/or1k-more-ram.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur linux-4.8.11.orig/arch/openrisc/boot/dts/or1ksim.dts linux-4.8.11/arch/openrisc/boot/dts/or1ksim.dts ---- linux-4.8.11.orig/arch/openrisc/boot/dts/or1ksim.dts 2016-11-26 09:57:13.000000000 +0100 -+++ linux-4.8.11/arch/openrisc/boot/dts/or1ksim.dts 2016-12-04 14:39:46.092952799 +0100 -@@ -11,7 +11,7 @@ - - memory@0 { - device_type = "memory"; -- reg = <0x00000000 0x02000000>; -+ reg = <0x00000000 0x04000000>; - }; - - cpus { diff --git a/target/linux/patches/4.19.213/relocs.patch b/target/linux/patches/4.19.213/relocs.patch deleted file mode 100644 index 5bcd974c7..000000000 --- a/target/linux/patches/4.19.213/relocs.patch +++ /dev/null @@ -1,2698 +0,0 @@ -diff -Nur linux-5.4.42.orig/arch/x86/tools/relocs.h linux-5.4.42/arch/x86/tools/relocs.h ---- linux-5.4.42.orig/arch/x86/tools/relocs.h 2020-05-20 08:20:41.000000000 +0200 -+++ linux-5.4.42/arch/x86/tools/relocs.h 2020-06-06 18:18:17.000000000 +0200 -@@ -10,11 +10,19 @@ - #include - #include - #include -+#ifdef __linux__ - #include - #include - #define USE_BSD - #include -+#else -+#include "elf.h" -+#endif -+#ifdef __APPLE__ -+#include -+#else - #include -+#endif - #include - - void die(char *fmt, ...) __attribute__((noreturn)); -diff -Nur linux-5.4.42.orig/tools/include/elf.h linux-5.4.42/tools/include/elf.h ---- linux-5.4.42.orig/tools/include/elf.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-5.4.42/tools/include/elf.h 2020-06-06 18:18:17.000000000 +0200 -@@ -0,0 +1,2671 @@ -+#ifndef _ELF_H -+#define _ELF_H -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+#include -+ -+typedef uint16_t Elf32_Half; -+typedef uint16_t Elf64_Half; -+ -+typedef uint32_t Elf32_Word; -+typedef int32_t Elf32_Sword; -+typedef uint32_t Elf64_Word; -+typedef int32_t Elf64_Sword; -+ -+typedef uint64_t Elf32_Xword; -+typedef int64_t Elf32_Sxword; -+typedef uint64_t Elf64_Xword; -+typedef int64_t Elf64_Sxword; -+ -+typedef uint32_t Elf32_Addr; -+typedef uint64_t Elf64_Addr; -+ -+typedef uint32_t Elf32_Off; -+typedef uint64_t Elf64_Off; -+ -+typedef uint16_t Elf32_Section; -+typedef uint16_t Elf64_Section; -+ -+typedef Elf32_Half Elf32_Versym; -+typedef Elf64_Half Elf64_Versym; -+ -+#define EI_NIDENT (16) -+ -+typedef struct { -+ unsigned char e_ident[EI_NIDENT]; -+ Elf32_Half e_type; -+ Elf32_Half e_machine; -+ Elf32_Word e_version; -+ Elf32_Addr e_entry; -+ Elf32_Off e_phoff; -+ Elf32_Off e_shoff; -+ Elf32_Word e_flags; -+ Elf32_Half e_ehsize; -+ Elf32_Half e_phentsize; -+ Elf32_Half e_phnum; -+ Elf32_Half e_shentsize; -+ Elf32_Half e_shnum; -+ Elf32_Half e_shstrndx; -+} Elf32_Ehdr; -+ -+typedef struct { -+ unsigned char e_ident[EI_NIDENT]; -+ Elf64_Half e_type; -+ Elf64_Half e_machine; -+ Elf64_Word e_version; -+ Elf64_Addr e_entry; -+ Elf64_Off e_phoff; -+ Elf64_Off e_shoff; -+ Elf64_Word e_flags; -+ Elf64_Half e_ehsize; -+ Elf64_Half e_phentsize; -+ Elf64_Half e_phnum; -+ Elf64_Half e_shentsize; -+ Elf64_Half e_shnum; -+ Elf64_Half e_shstrndx; -+} Elf64_Ehdr; -+ -+#define EI_MAG0 0 -+#define ELFMAG0 0x7f -+ -+#define EI_MAG1 1 -+#define ELFMAG1 'E' -+ -+#define EI_MAG2 2 -+#define ELFMAG2 'L' -+ -+#define EI_MAG3 3 -+#define ELFMAG3 'F' -+ -+ -+#define ELFMAG "\177ELF" -+#define SELFMAG 4 -+ -+#define EI_CLASS 4 -+#define ELFCLASSNONE 0 -+#define ELFCLASS32 1 -+#define ELFCLASS64 2 -+#define ELFCLASSNUM 3 -+ -+#define EI_DATA 5 -+#define ELFDATANONE 0 -+#define ELFDATA2LSB 1 -+#define ELFDATA2MSB 2 -+#define ELFDATANUM 3 -+ -+#define EI_VERSION 6 -+ -+ -+#define EI_OSABI 7 -+#define ELFOSABI_NONE 0 -+#define ELFOSABI_SYSV 0 -+#define ELFOSABI_HPUX 1 -+#define ELFOSABI_NETBSD 2 -+#define ELFOSABI_LINUX 3 -+#define ELFOSABI_GNU 3 -+#define ELFOSABI_SOLARIS 6 -+#define ELFOSABI_AIX 7 -+#define ELFOSABI_IRIX 8 -+#define ELFOSABI_FREEBSD 9 -+#define ELFOSABI_TRU64 10 -+#define ELFOSABI_MODESTO 11 -+#define ELFOSABI_OPENBSD 12 -+#define ELFOSABI_ARM 97 -+#define ELFOSABI_STANDALONE 255 -+ -+#define EI_ABIVERSION 8 -+ -+#define EI_PAD 9 -+ -+ -+ -+#define ET_NONE 0 -+#define ET_REL 1 -+#define ET_EXEC 2 -+#define ET_DYN 3 -+#define ET_CORE 4 -+#define ET_NUM 5 -+#define ET_LOOS 0xfe00 -+#define ET_HIOS 0xfeff -+#define ET_LOPROC 0xff00 -+#define ET_HIPROC 0xffff -+ -+ -+ -+#define EM_NONE 0 -+#define EM_M32 1 -+#define EM_SPARC 2 -+#define EM_386 3 -+#define EM_68K 4 -+#define EM_88K 5 -+#define EM_860 7 -+#define EM_MIPS 8 -+#define EM_S370 9 -+#define EM_MIPS_RS3_LE 10 -+ -+#define EM_PARISC 15 -+#define EM_VPP500 17 -+#define EM_SPARC32PLUS 18 -+#define EM_960 19 -+#define EM_PPC 20 -+#define EM_PPC64 21 -+#define EM_S390 22 -+ -+#define EM_V800 36 -+#define EM_FR20 37 -+#define EM_RH32 38 -+#define EM_RCE 39 -+#define EM_ARM 40 -+#define EM_FAKE_ALPHA 41 -+#define EM_SH 42 -+#define EM_SPARCV9 43 -+#define EM_TRICORE 44 -+#define EM_ARC 45 -+#define EM_H8_300 46 -+#define EM_H8_300H 47 -+#define EM_H8S 48 -+#define EM_H8_500 49 -+#define EM_IA_64 50 -+#define EM_MIPS_X 51 -+#define EM_COLDFIRE 52 -+#define EM_68HC12 53 -+#define EM_MMA 54 -+#define EM_PCP 55 -+#define EM_NCPU 56 -+#define EM_NDR1 57 -+#define EM_STARCORE 58 -+#define EM_ME16 59 -+#define EM_ST100 60 -+#define EM_TINYJ 61 -+#define EM_X86_64 62 -+#define EM_PDSP 63 -+ -+#define EM_FX66 66 -+#define EM_ST9PLUS 67 -+#define EM_ST7 68 -+#define EM_68HC16 69 -+#define EM_68HC11 70 -+#define EM_68HC08 71 -+#define EM_68HC05 72 -+#define EM_SVX 73 -+#define EM_ST19 74 -+#define EM_VAX 75 -+#define EM_CRIS 76 -+#define EM_JAVELIN 77 -+#define EM_FIREPATH 78 -+#define EM_ZSP 79 -+#define EM_MMIX 80 -+#define EM_HUANY 81 -+#define EM_PRISM 82 -+#define EM_AVR 83 -+#define EM_FR30 84 -+#define EM_D10V 85 -+#define EM_D30V 86 -+#define EM_V850 87 -+#define EM_M32R 88 -+#define EM_MN10300 89 -+#define EM_MN10200 90 -+#define EM_PJ 91 -+#define EM_OPENRISC 92 -+#define EM_ARC_A5 93 -+#define EM_XTENSA 94 -+#define EM_AARCH64 183 -+#define EM_TILEPRO 188 -+#define EM_MICROBLAZE 189 -+#define EM_TILEGX 191 -+#define EM_NUM 192 -+#define EM_ALPHA 0x9026 -+ -+#define EV_NONE 0 -+#define EV_CURRENT 1 -+#define EV_NUM 2 -+ -+typedef struct { -+ Elf32_Word sh_name; -+ Elf32_Word sh_type; -+ Elf32_Word sh_flags; -+ Elf32_Addr sh_addr; -+ Elf32_Off sh_offset; -+ Elf32_Word sh_size; -+ Elf32_Word sh_link; -+ Elf32_Word sh_info; -+ Elf32_Word sh_addralign; -+ Elf32_Word sh_entsize; -+} Elf32_Shdr; -+ -+typedef struct { -+ Elf64_Word sh_name; -+ Elf64_Word sh_type; -+ Elf64_Xword sh_flags; -+ Elf64_Addr sh_addr; -+ Elf64_Off sh_offset; -+ Elf64_Xword sh_size; -+ Elf64_Word sh_link; -+ Elf64_Word sh_info; -+ Elf64_Xword sh_addralign; -+ Elf64_Xword sh_entsize; -+} Elf64_Shdr; -+ -+ -+ -+#define SHN_UNDEF 0 -+#define SHN_LORESERVE 0xff00 -+#define SHN_LOPROC 0xff00 -+#define SHN_BEFORE 0xff00 -+ -+#define SHN_AFTER 0xff01 -+ -+#define SHN_HIPROC 0xff1f -+#define SHN_LOOS 0xff20 -+#define SHN_HIOS 0xff3f -+#define SHN_ABS 0xfff1 -+#define SHN_COMMON 0xfff2 -+#define SHN_XINDEX 0xffff -+#define SHN_HIRESERVE 0xffff -+ -+ -+ -+#define SHT_NULL 0 -+#define SHT_PROGBITS 1 -+#define SHT_SYMTAB 2 -+#define SHT_STRTAB 3 -+#define SHT_RELA 4 -+#define SHT_HASH 5 -+#define SHT_DYNAMIC 6 -+#define SHT_NOTE 7 -+#define SHT_NOBITS 8 -+#define S