diff options
Diffstat (limited to 'target')
| -rw-r--r-- | target/arc/kernel/synopsys-hsdk | 6 | ||||
| -rw-r--r-- | target/linux/Config.in.kernelversion | 4 | ||||
| -rw-r--r-- | target/linux/config/Config.in.arc | 7 | ||||
| -rw-r--r-- | target/linux/config/Config.in.block | 3 | ||||
| -rw-r--r-- | target/linux/config/Config.in.dma | 8 | ||||
| -rw-r--r-- | target/x86/Makefile | 2 | ||||
| -rw-r--r-- | target/x86_64/Makefile | 2 |
7 files changed, 30 insertions, 2 deletions
diff --git a/target/arc/kernel/synopsys-hsdk b/target/arc/kernel/synopsys-hsdk index 55ae3ccb6..a4e93f109 100644 --- a/target/arc/kernel/synopsys-hsdk +++ b/target/arc/kernel/synopsys-hsdk @@ -9,3 +9,9 @@ CONFIG_ARC_USE_UNALIGNED_MEM_ACCESS=y CONFIG_ARC_HAS_LL64=y CONFIG_ARC_HAS_DIV_REM=y CONFIG_ARC_HAS_ACCL_REGS=y +CONFIG_ARC_CACHE=y +CONFIG_ARC_CACHE_LINE_SHIFT=6 +CONFIG_ARC_HAS_ICACHE=y +CONFIG_ARC_HAS_DCACHE=y +CONFIG_ARC_CACHE_PAGES=y + diff --git a/target/linux/Config.in.kernelversion b/target/linux/Config.in.kernelversion index 83677fc69..cb1d110fe 100644 --- a/target/linux/Config.in.kernelversion +++ b/target/linux/Config.in.kernelversion @@ -39,8 +39,8 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_GIT depends on !ADK_TARGET_ARCH_NDS32 select ADK_HOST_NEED_LZ4 if ADK_TARGET_SYSTEM_PHYTEC_WEGA && ADK_TARGET_LINUX_KERNEL_VERSION_GIT -config ADK_TARGET_LINUX_KERNEL_VERSION_6_13 - bool "6.13.9" +config ADK_TARGET_LINUX_KERNEL_VERSION_6_14 + bool "6.14.2" depends on !ADK_TARGET_ARCH_AVR32 depends on !ADK_TARGET_ARCH_BFIN depends on !ADK_TARGET_ARCH_C6X diff --git a/target/linux/config/Config.in.arc b/target/linux/config/Config.in.arc index 461d1b7cd..f2da2a7ea 100644 --- a/target/linux/config/Config.in.arc +++ b/target/linux/config/Config.in.arc @@ -24,4 +24,11 @@ config ADK_LINUX_KERNEL_ARC_BUILTIN_DTB_NAME default "haps_hs" if ADK_TARGET_CPU_ARC_ARCHS && ADK_TARGET_SYSTEM_QEMU_ARC default "nsim_700" if ADK_TARGET_CPU_ARC_ARC700 +config ADK_LINUX_KERNEL_BUILTIN_DTB_NAME + string + depends on ADK_TARGET_ARCH_ARC + default "hsdk" if ADK_TARGET_CPU_ARC_ARCHS && ADK_TARGET_SYSTEM_SYNOPSYS_HSDK + default "haps_hs" if ADK_TARGET_CPU_ARC_ARCHS && ADK_TARGET_SYSTEM_SYNOPSYS_NSIM + default "haps_hs" if ADK_TARGET_CPU_ARC_ARCHS && ADK_TARGET_SYSTEM_QEMU_ARC + default "nsim_700" if ADK_TARGET_CPU_ARC_ARC700 diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block index 2da563549..8ccb10e72 100644 --- a/target/linux/config/Config.in.block +++ b/target/linux/config/Config.in.block @@ -497,10 +497,13 @@ config ADK_LINUX_KERNEL_MMC_DW select ADK_LINUX_KERNEL_MMC select ADK_LINUX_KERNEL_MMC_SPI select ADK_LINUX_KERNEL_MMC_BLOCK + select ADK_LINUX_KERNEL_MMC_DW_PLTFM select ADK_LINUX_KERNEL_BLK_DEV select ADK_LINUX_KERNEL_BLK_DEV_SD select ADK_LINUX_KERNEL_MMC_SDHCI select ADK_LINUX_KERNEL_MMC_SDHCI_PLTFM + select ADK_LINUX_KERNEL_PWRSEQ_EMMC + select ADK_LINUX_KERNEL_PWRSEQ_SIMPLE depends on ADK_TARGET_SYSTEM_SYNOPSYS_HSDK default y if ADK_TARGET_SYSTEM_SYNOPSYS_HSDK default n diff --git a/target/linux/config/Config.in.dma b/target/linux/config/Config.in.dma index c570b546e..11094514b 100644 --- a/target/linux/config/Config.in.dma +++ b/target/linux/config/Config.in.dma @@ -58,6 +58,14 @@ config ADK_LINUX_KERNEL_DMA_BCM2708 default y if ADK_TARGET_BOARD_BCM28XX default n +config ADK_LINUX_KERNEL_DW_AXI_DMAC + bool + select ADK_LINUX_KERNEL_DMADEVICES + select ADK_LINUX_KERNEL_DMA_SHARED_BUFFER + depends on ADK_TARGET_SYSTEM_SYNOPSYS_HSDK + default y if ADK_TARGET_SYSTEM_SYNOPSYS_HSDK + default n + config ADK_LINUX_KERNEL_IMX_SDMA bool select ADK_LINUX_KERNEL_MXS_DMA diff --git a/target/x86/Makefile b/target/x86/Makefile index d2283400c..9298c3cbb 100644 --- a/target/x86/Makefile +++ b/target/x86/Makefile @@ -13,7 +13,9 @@ QEMU_ARGS+=${ADK_QEMU_ARGS} ifeq ($(ADK_TARGET_QEMU_WITH_VIRTIO),y) QEMU_ARGS+=-net nic,model=virtio -net user +ifeq ($(ADK_TARGET_FS),archive) QEMU_ARGS+=-drive file=qemu-${ADK_TARGET_CPU_ARCH}.img,if=virtio +endif else QEMU_ARGS+=-net user -net nic,model=e1000 endif diff --git a/target/x86_64/Makefile b/target/x86_64/Makefile index 221311091..d9cb4ca62 100644 --- a/target/x86_64/Makefile +++ b/target/x86_64/Makefile @@ -18,7 +18,9 @@ endif ifeq ($(ADK_TARGET_QEMU_WITH_VIRTIO),y) QEMU_ARGS+=-net nic,model=virtio -net user +ifeq ($(ADK_TARGET_FS),archive) QEMU_ARGS+=-drive file=qemu-${ADK_TARGET_CPU_ARCH}.img,if=virtio +endif else QEMU_ARGS+=-net user -net nic,model=e1000 endif |