summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2022-09-22 14:03:07 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2022-09-22 14:03:07 +0200
commitba48db8275730fbc512c0872ae426970a09b5619 (patch)
treef64154d20f3faada75a3b9ef2baeeff012dac76a /mk
parent56ede91e9f8f8211a6fc62cd5f56d95a76fec9a7 (diff)
add support for STM32F746G-DISCO device
Tested with toolbox / simpleinit as userland. FDPIC/FLAT support both successfully tested. No LCD or Ethernet support.
Diffstat (limited to 'mk')
-rw-r--r--mk/image.mk13
-rw-r--r--mk/linux-ver.mk12
2 files changed, 16 insertions, 9 deletions
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