diff options
Diffstat (limited to 'target/arm')
| -rw-r--r-- | target/arm/Makefile | 2 | ||||
| -rw-r--r-- | target/arm/kernel/banana-p2-zero | 1 | ||||
| -rw-r--r-- | target/arm/kernel/kinetis-k70 | 1 | ||||
| -rw-r--r-- | target/arm/kernel/qemu-arm-realview-eb-mpcore | 1 | ||||
| -rw-r--r-- | target/arm/kernel/qemu-arm-spitz | 1 | ||||
| -rw-r--r-- | target/arm/kernel/qemu-arm-terrier | 1 | ||||
| -rw-r--r-- | target/arm/kernel/qemu-arm-versatilepb | 1 | ||||
| -rw-r--r-- | target/arm/kernel/qemu-arm-vexpress-a9 | 1 | ||||
| -rw-r--r-- | target/arm/kernel/raspberry-pi4 | 1 | ||||
| -rw-r--r-- | target/arm/kernel/solidrun-imx6 | 1 | ||||
| -rw-r--r-- | target/arm/kernel/st-stm32f746g | 1 | ||||
| -rw-r--r-- | target/arm/systems/kinetis-k70 | 5 |
12 files changed, 5 insertions, 12 deletions
diff --git a/target/arm/Makefile b/target/arm/Makefile index 280e954b7..9ce20ef4f 100644 --- a/target/arm/Makefile +++ b/target/arm/Makefile @@ -180,7 +180,7 @@ ifeq ($(ADK_TARGET_FS),squashfs) dd conv=notrunc if=$(BUILD_DIR)/root.squashfs of=$(FW_DIR)/$(ROOTFSSQUASHFS) endif -ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_6)$(ADK_TARGET_LINUX_KERNEL_VERSION_6_9)$(ADK_TARGET_LINUX_KERNEL_VERSION_GIT),y) +ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_6)$(ADK_TARGET_LINUX_KERNEL_VERSION_6_12)$(ADK_TARGET_LINUX_KERNEL_VERSION_GIT),y) ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB),y) VENDOR:=arm/ endif diff --git a/target/arm/kernel/banana-p2-zero b/target/arm/kernel/banana-p2-zero index 586bc605a..acd35737e 100644 --- a/target/arm/kernel/banana-p2-zero +++ b/target/arm/kernel/banana-p2-zero @@ -37,7 +37,6 @@ CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y CONFIG_CLONE_BACKWARDS=y CONFIG_OLD_SIGSUSPEND3=y CONFIG_OLD_SIGACTION=y -CONFIG_COMPAT_32BIT_TIME=y CONFIG_HAVE_ARCH_VMAP_STACK=y CONFIG_VMAP_STACK=y CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y diff --git a/target/arm/kernel/kinetis-k70 b/target/arm/kernel/kinetis-k70 index 5093d7a65..ab4539110 100644 --- a/target/arm/kernel/kinetis-k70 +++ b/target/arm/kernel/kinetis-k70 @@ -19,3 +19,4 @@ CONFIG_GPIOLIB=y CONFIG_SLAB=y CONFIG_SERIAL_KINETIS=y CONFIG_SERIAL_KINETIS_CONSOLE=y +CONFIG_CMDLINE=console=ttyS2,115200 rw root=/dev/nfs ip=dhcp kinetis_platform=k70-som" diff --git a/target/arm/kernel/qemu-arm-realview-eb-mpcore b/target/arm/kernel/qemu-arm-realview-eb-mpcore index acd059cc8..9f967f4f2 100644 --- a/target/arm/kernel/qemu-arm-realview-eb-mpcore +++ b/target/arm/kernel/qemu-arm-realview-eb-mpcore @@ -16,4 +16,3 @@ CONFIG_KUSER_HELPERS=y CONFIG_ATAGS=y CONFIG_CMDLINE="console=ttyAMA0 mem=128M" CONFIG_CMDLINE_FROM_BOOTLOADER=y -CONFIG_COMPAT_32BIT_TIME=y diff --git a/target/arm/kernel/qemu-arm-spitz b/target/arm/kernel/qemu-arm-spitz index 259028d95..09a1d76ff 100644 --- a/target/arm/kernel/qemu-arm-spitz +++ b/target/arm/kernel/qemu-arm-spitz @@ -44,4 +44,3 @@ CONFIG_SERIAL_PXA_NON8250=y CONFIG_SERIAL_PXA_CONSOLE=y CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y -CONFIG_COMPAT_32BIT_TIME=y diff --git a/target/arm/kernel/qemu-arm-terrier b/target/arm/kernel/qemu-arm-terrier index 4a947ea14..e8a01e232 100644 --- a/target/arm/kernel/qemu-arm-terrier +++ b/target/arm/kernel/qemu-arm-terrier @@ -44,4 +44,3 @@ CONFIG_SERIAL_PXA_NON8250=y CONFIG_SERIAL_PXA_CONSOLE=y CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y -CONFIG_COMPAT_32BIT_TIME=y diff --git a/target/arm/kernel/qemu-arm-versatilepb b/target/arm/kernel/qemu-arm-versatilepb index 148fda569..8c08abdc7 100644 --- a/target/arm/kernel/qemu-arm-versatilepb +++ b/target/arm/kernel/qemu-arm-versatilepb @@ -15,4 +15,3 @@ CONFIG_PLAT_VERSATILE_SCHED_CLOCK=y CONFIG_PLAT_VERSATILE=y CONFIG_VECTORS_BASE=0x00000000 CONFIG_PHYS_OFFSET=0x00000000 -CONFIG_COMPAT_32BIT_TIME=y diff --git a/target/arm/kernel/qemu-arm-vexpress-a9 b/target/arm/kernel/qemu-arm-vexpress-a9 index b3953ad10..170965e9b 100644 --- a/target/arm/kernel/qemu-arm-vexpress-a9 +++ b/target/arm/kernel/qemu-arm-vexpress-a9 @@ -13,7 +13,6 @@ CONFIG_ARM_THUMB=y CONFIG_ARM_VIRT_EXT=y CONFIG_SWP_EMULATE=y CONFIG_KUSER_HELPERS=y -CONFIG_COMPAT_32BIT_TIME=y CONFIG_ARM_AMBA=y CONFIG_MFD_CORE=y CONFIG_MFD_SYSCON=y diff --git a/target/arm/kernel/raspberry-pi4 b/target/arm/kernel/raspberry-pi4 index 77c23a997..04b7aadff 100644 --- a/target/arm/kernel/raspberry-pi4 +++ b/target/arm/kernel/raspberry-pi4 @@ -25,7 +25,6 @@ CONFIG_RASPBERRYPI_FIRMWARE=y CONFIG_CLK_BCM2711_DVP=y CONFIG_CLK_BCM2835=y CONFIG_CLK_RASPBERRYPI=y -CONFIG_COMPAT_32BIT_TIME=y CONFIG_SERIAL_DEV_BUS=y CONFIG_GPIO_CDEV=y CONFIG_GPIO_CDEV_V1=y diff --git a/target/arm/kernel/solidrun-imx6 b/target/arm/kernel/solidrun-imx6 index 801f1d1b7..3289ef4e7 100644 --- a/target/arm/kernel/solidrun-imx6 +++ b/target/arm/kernel/solidrun-imx6 @@ -21,7 +21,6 @@ CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_ATAGS_PROC=y CONFIG_AUTO_ZRELADDR=y -CONFIG_COMPAT_32BIT_TIME=y CONFIG_MXC_TZIC=y CONFIG_MXC_AVIC=y diff --git a/target/arm/kernel/st-stm32f746g b/target/arm/kernel/st-stm32f746g index 7c8375059..a156d2bff 100644 --- a/target/arm/kernel/st-stm32f746g +++ b/target/arm/kernel/st-stm32f746g @@ -25,4 +25,3 @@ CONFIG_DMADEVICES=y CONFIG_STM32_DMA=y CONFIG_STM32_DMAMUX=y CONFIG_STM32_MDMA=y -CONFIG_COMPAT_32BIT_TIME=y diff --git a/target/arm/systems/kinetis-k70 b/target/arm/systems/kinetis-k70 index 624c8874e..73b4783ba 100644 --- a/target/arm/systems/kinetis-k70 +++ b/target/arm/systems/kinetis-k70 @@ -2,7 +2,7 @@ config ADK_TARGET_SYSTEM_KINETIS_K70 bool "Kinetis K70" depends on ADK_TARGET_OS_LINUX select ADK_TARGET_LITTLE_ENDIAN - select ADK_TARGET_CPU_ARM_CORTEX_M3 + select ADK_TARGET_CPU_ARM_CORTEX_M4 select ADK_TARGET_ARCH_ARM_WITH_THUMB select ADK_TARGET_WITH_SERIAL select ADK_TARGET_WITH_USB @@ -11,7 +11,8 @@ config ADK_TARGET_SYSTEM_KINETIS_K70 select ADK_TARGET_WITH_BLOCK select ADK_TARGET_WITH_NAND select ADK_TARGET_UCLINUX - select ADK_TARGET_KERNEL_IMAGE + select ADK_TARGET_KERNEL_UIMAGE + select ADK_HOST_BUILD_U_BOOT help Kinetis K70 |