aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2017-10-14 00:00:43 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2017-10-14 00:32:39 +0200
commitc4f720b19a2699b577584f970254163853cea1d1 (patch)
treef5143e634d2674da26c861377b324e41aa42985a
parentb4c357066695181864a9f9e91bb1bc5ef18e18c8 (diff)
downloadupstream-c4f720b19a2699b577584f970254163853cea1d1.tar.gz
upstream-c4f720b19a2699b577584f970254163853cea1d1.tar.bz2
upstream-c4f720b19a2699b577584f970254163853cea1d1.zip
at91: refresh kernel configuration
This was done by running "make kernel_oldconfig" and "make kernel_oldconfig CONFIG_TARGET=subtarget" Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
-rw-r--r--target/linux/at91/config-4.45
-rw-r--r--target/linux/at91/legacy/config-default33
-rw-r--r--target/linux/at91/sama5/config-default45
3 files changed, 35 insertions, 48 deletions
diff --git a/target/linux/at91/config-4.4 b/target/linux/at91/config-4.4
index 4e3b036110..526ef0923e 100644
--- a/target/linux/at91/config-4.4
+++ b/target/linux/at91/config-4.4
@@ -135,11 +135,6 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
CONFIG_HAVE_FUNCTION_TRACER=y
CONFIG_HAVE_GENERIC_DMA_COHERENT=y
CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
-CONFIG_HAVE_KERNEL_GZIP=y
-CONFIG_HAVE_KERNEL_LZ4=y
-CONFIG_HAVE_KERNEL_LZMA=y
-CONFIG_HAVE_KERNEL_LZO=y
-CONFIG_HAVE_KERNEL_XZ=y
CONFIG_HAVE_LATENCYTOP_SUPPORT=y
CONFIG_HAVE_MEMBLOCK=y
CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
diff --git a/target/linux/at91/legacy/config-default b/target/linux/at91/legacy/config-default
index 12beb46f6a..e69de29bb2 100644
--- a/target/linux/at91/legacy/config-default
+++ b/target/linux/at91/legacy/config-default
@@ -1,33 +0,0 @@
-# CONFIG_ARCH_AT91RM9200 is not set
-# CONFIG_ARCH_AT91SAM9260 is not set
-# CONFIG_ARCH_AT91SAM9261 is not set
-# CONFIG_ARCH_AT91SAM9263 is not set
-# CONFIG_ARCH_AT91SAM9G10 is not set
-# CONFIG_ARCH_AT91SAM9G20 is not set
-# CONFIG_ARCH_AT91SAM9G45 is not set
-# CONFIG_ARCH_AT91SAM9RL is not set
-CONFIG_ARCH_AT91_NONE=y
-CONFIG_ARM_L1_CACHE_SHIFT=5
-CONFIG_CPU_32v5=y
-CONFIG_CPU_ABRT_EV5TJ=y
-CONFIG_CPU_ARM926T=y
-# CONFIG_CPU_CACHE_ROUND_ROBIN is not set
-CONFIG_CPU_CACHE_VIVT=y
-CONFIG_CPU_COPY_V4WB=y
-CONFIG_CPU_CP15=y
-CONFIG_CPU_CP15_MMU=y
-# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
-# CONFIG_CPU_ICACHE_DISABLE is not set
-CONFIG_CPU_PABRT_LEGACY=y
-CONFIG_CPU_TLB_V4WBI=y
-# CONFIG_SOC_AT91RM9200 is not set
-CONFIG_SOC_AT91SAM9=y
-CONFIG_SOC_AT91SAM9260=y
-CONFIG_SOC_AT91SAM9261=y
-CONFIG_SOC_AT91SAM9263=y
-CONFIG_SOC_AT91SAM9G45=y
-CONFIG_SOC_AT91SAM9N12=y
-CONFIG_SOC_AT91SAM9RL=y
-CONFIG_SOC_AT91SAM9X5=y
-CONFIG_SOC_SAM_V4_V5=y
-# CONFIG_SOC_SAM_V7 is not set
diff --git a/target/linux/at91/sama5/config-default b/target/linux/at91/sama5/config-default
index 660e27e8aa..aeb0b3c1ed 100644
--- a/target/linux/at91/sama5/config-default
+++ b/target/linux/at91/sama5/config-default
@@ -1,20 +1,45 @@
-# CONFIG_ARCH_MULTI_V4_V5 is not set
-# CONFIG_ARCH_MULTI_V5 is not set
+# CONFIG_ARCH_MULTI_CPU_AUTO is not set
+CONFIG_ARCH_MULTI_V6_V7=y
CONFIG_ARCH_MULTI_V7=y
+CONFIG_ARM_HEAVY_MB=y
+CONFIG_ARM_L1_CACHE_SHIFT=6
+CONFIG_ARM_L1_CACHE_SHIFT_6=y
# CONFIG_ARM_LPAE is not set
# CONFIG_ARM_THUMBEE is not set
-# CONFIG_CPU_ICACHE_DISABLE is not set
+CONFIG_ARM_VIRT_EXT=y
+CONFIG_ATMEL_AIC5_IRQ=y
+CONFIG_CACHE_L2X0=y
+CONFIG_CPU_32v6K=y
+CONFIG_CPU_32v7=y
+CONFIG_CPU_ABRT_EV7=y
# CONFIG_CPU_BPREDICT_DISABLE is not set
-CONFIG_SOC_SAMA5=y
-# CONFIG_SOC_SAM_V4_V5 is not set
-CONFIG_SOC_SAM_V7=y
-CONFIG_SOC_SAMA5D2=y
-CONFIG_SOC_SAMA5D3=y
-CONFIG_SOC_SAMA5D4=y
-CONFIG_MACH_SAMA5_DT=y
+CONFIG_CPU_CACHE_V7=y
+CONFIG_CPU_CACHE_VIPT=y
+CONFIG_CPU_COPY_V6=y
+CONFIG_CPU_HAS_ASID=y
+CONFIG_CPU_PABRT_V7=y
+CONFIG_CPU_TLB_V7=y
+CONFIG_CPU_V7=y
+CONFIG_DCACHE_WORD_ACCESS=y
+CONFIG_GENERIC_PINCONF=y
+CONFIG_HAVE_ARCH_BITREVERSE=y
+CONFIG_HAVE_AT91_GENERATED_CLK=y
+CONFIG_HAVE_AT91_H32MX=y
+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_HAVE_SMP=y
+CONFIG_MIGHT_HAVE_CACHE_L2X0=y
+CONFIG_OUTER_CACHE=y
+CONFIG_OUTER_CACHE_SYNC=y
+CONFIG_PINCTRL_AT91PIO4=y
CONFIG_PL310_ERRATA_588369=y
CONFIG_PL310_ERRATA_727915=y
CONFIG_PL310_ERRATA_753970=y
CONFIG_PL310_ERRATA_769419=y
+CONFIG_SOC_SAMA5=y
+CONFIG_SOC_SAMA5D2=y
+CONFIG_SOC_SAMA5D3=y
+CONFIG_SOC_SAMA5D4=y
+CONFIG_SOC_SAM_V7=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
# CONFIG_SWP_EMULATE is not set
# CONFIG_THUMB2_KERNEL is not set