Browse Source

- remove my mistake commited apollo-kronos.diff

master
vanhofen 4 years ago
parent
commit
6226591d25
  1. 228
      configs/apollo-kronos.diff

228
configs/apollo-kronos.diff

@ -1,228 +0,0 @@
--- kernel-3.10.93-apollo.config 2019-08-26 22:43:35.226206824 +0200
+++ kernel-3.10.93-kronos.config 2019-08-26 22:43:35.226206824 +0200
@@ -12,12 +12,10 @@
CONFIG_ARCH_HAS_CPUFREQ=y
CONFIG_GENERIC_HWEIGHT=y
CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_ZONE_DMA=y
CONFIG_NEED_DMA_MAP_STATE=y
CONFIG_VECTORS_BASE=0xffff0000
-# CONFIG_ARM_PATCH_PHYS_VIRT is not set
+CONFIG_ARM_PATCH_PHYS_VIRT=y
CONFIG_NEED_MACH_IO_H=y
-CONFIG_NEED_MACH_MEMORY_H=y
CONFIG_GENERIC_BUG=y
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
CONFIG_IRQ_WORK=y
@@ -268,20 +266,19 @@
# CONFIG_GPIO_PCA953X is not set
# CONFIG_KEYBOARD_GPIO_POLLED is not set
# CONFIG_PLAT_SPEAR is not set
-CONFIG_ARCH_APOLLO=y
-# CONFIG_ARCH_KRONOS is not set
-CONFIG_DEBUG_STB_UART=2
+# CONFIG_ARCH_APOLLO is not set
+CONFIG_ARCH_KRONOS=y
+CONFIG_DEBUG_STB_UART=1
CONFIG_STB_MEM_RESRV=y
CONFIG_STB_SPLASH=y
-# CONFIG_STB_EARLY_UART1 is not set
-CONFIG_STB_EARLY_UART2=y
+CONFIG_STB_EARLY_UART1=y
+# CONFIG_STB_EARLY_UART2 is not set
# CONFIG_STB_EARLY_UART3 is not set
-# CONFIG_STB_EARLY_UART4 is not set
#
-# Apollo Implementation
+# Kronos Implementation
#
-CONFIG_MACH_APOLLO=y
+CONFIG_MACH_KRONOS=y
#
# Processor Type
@@ -332,13 +329,13 @@
# CONFIG_ARM_ERRATA_643719 is not set
# CONFIG_ARM_ERRATA_720789 is not set
# CONFIG_PL310_ERRATA_727915 is not set
-# CONFIG_ARM_ERRATA_743622 is not set
+CONFIG_ARM_ERRATA_743622=y
# CONFIG_ARM_ERRATA_751472 is not set
# CONFIG_PL310_ERRATA_753970 is not set
CONFIG_ARM_ERRATA_754322=y
# CONFIG_ARM_ERRATA_754327 is not set
# CONFIG_ARM_ERRATA_764369 is not set
-# CONFIG_PL310_ERRATA_769419 is not set
+CONFIG_PL310_ERRATA_769419=y
# CONFIG_ARM_ERRATA_775420 is not set
# CONFIG_ARM_ERRATA_798181 is not set
@@ -379,24 +376,20 @@
# CONFIG_THUMB2_KERNEL is not set
CONFIG_AEABI=y
CONFIG_OABI_COMPAT=y
-CONFIG_ARCH_SPARSEMEM_ENABLE=y
-CONFIG_ARCH_SPARSEMEM_DEFAULT=y
-CONFIG_ARCH_SELECT_MEMORY_MODEL=y
-# CONFIG_HAVE_ARCH_PFN_VALID is not set
+# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
+# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
+CONFIG_HAVE_ARCH_PFN_VALID=y
# CONFIG_HIGHMEM is not set
-CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_SPARSEMEM_MANUAL=y
-CONFIG_SPARSEMEM=y
-CONFIG_HAVE_MEMORY_PRESENT=y
-CONFIG_SPARSEMEM_EXTREME=y
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
CONFIG_HAVE_MEMBLOCK=y
# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set
+CONFIG_PAGEFLAGS_EXTENDED=y
CONFIG_SPLIT_PTLOCK_CPUS=4
CONFIG_COMPACTION=y
CONFIG_MIGRATION=y
# CONFIG_PHYS_ADDR_T_64BIT is not set
-CONFIG_ZONE_DMA_FLAG=1
-CONFIG_BOUNCE=y
+CONFIG_ZONE_DMA_FLAG=0
CONFIG_NEED_BOUNCE_POOL=y
# CONFIG_KSM is not set
CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
@@ -1043,7 +1036,6 @@
#
# PATA SFF controllers with BMDMA
#
-# CONFIG_PATA_ARASAN_CF is not set
#
# PIO-only SFF controllers
@@ -1121,7 +1113,7 @@
# CONFIG_BROADCOM_PHY is not set
# CONFIG_BCM87XX_PHY is not set
# CONFIG_ICPLUS_PHY is not set
-CONFIG_REALTEK_PHY=y
+# CONFIG_REALTEK_PHY is not set
# CONFIG_NATIONAL_PHY is not set
# CONFIG_STE10XP is not set
# CONFIG_LSI_ET1011C_PHY is not set
@@ -1294,7 +1286,7 @@
# CONFIG_SERIAL_XILINX_PS_UART is not set
# CONFIG_SERIAL_ARC is not set
CONFIG_IP3106=y
-# CONFIG_IP3106_UART0 is not set
+CONFIG_IP3106_UART0=y
CONFIG_SERIAL_IP3106_CONSOLE=y
# CONFIG_TTY_PRINTK is not set
# CONFIG_HVC_DCC is not set
@@ -1551,22 +1543,12 @@
CONFIG_IR_RC5_SZ_DECODER=m
CONFIG_IR_SANYO_DECODER=m
CONFIG_IR_MCE_KBD_DECODER=m
-CONFIG_RC_DEVICES=y
-# CONFIG_RC_ATI_REMOTE is not set
-# CONFIG_IR_IMON is not set
-# CONFIG_IR_MCEUSB is not set
-# CONFIG_IR_REDRAT3 is not set
-# CONFIG_IR_STREAMZAP is not set
-# CONFIG_IR_IGUANA is not set
-# CONFIG_IR_TTUSBIR is not set
-# CONFIG_RC_LOOPBACK is not set
-CONFIG_IR_GPIO_CIR=m
+# CONFIG_RC_DEVICES is not set
# CONFIG_MEDIA_USB_SUPPORT is not set
#
# Supported MMC/SDIO adapters
#
-# CONFIG_SMS_SDIO_DRV is not set
# CONFIG_CYPRESS_FIRMWARE is not set
#
@@ -2077,50 +2059,14 @@
# CONFIG_USB_RCAR_PHY is not set
# CONFIG_USB_ULPI is not set
# CONFIG_USB_GADGET is not set
-CONFIG_MMC=y
-# CONFIG_MMC_DEBUG is not set
-# CONFIG_MMC_UNSAFE_RESUME is not set
-# CONFIG_MMC_CLKGATE is not set
-
-#
-# MMC/SD/SDIO Card Drivers
-#
-CONFIG_MMC_BLOCK=y
-CONFIG_MMC_BLOCK_MINORS=8
-CONFIG_MMC_BLOCK_BOUNCE=y
-# CONFIG_SDIO_UART is not set
-# CONFIG_MMC_TEST is not set
-
-#
-# MMC/SD/SDIO Host Controller Drivers
-#
-# CONFIG_MMC_ARMMMCI is not set
-CONFIG_MMC_SDHCI=y
-# CONFIG_MMC_SDHCI_PLTFM is not set
-CONFIG_MMC_SDHCI_STB=y
-# CONFIG_MMC_SDHCI_PXAV3 is not set
-# CONFIG_MMC_SDHCI_PXAV2 is not set
-# CONFIG_MMC_DW is not set
-# CONFIG_MMC_VUB300 is not set
-# CONFIG_MMC_USHC is not set
+# CONFIG_MMC is not set
# CONFIG_MEMSTICK is not set
# CONFIG_NEW_LEDS is not set
# CONFIG_ACCESSIBILITY is not set
# CONFIG_EDAC is not set
CONFIG_RTC_LIB=y
# CONFIG_RTC_CLASS is not set
-CONFIG_DMADEVICES=y
-# CONFIG_DMADEVICES_DEBUG is not set
-
-#
-# DMA Devices
-#
-# CONFIG_AMBA_PL08X is not set
-# CONFIG_DW_DMAC is not set
-# CONFIG_NX_DMAC_1902 is not set
-# CONFIG_TIMB_DMA is not set
-# CONFIG_PL330_DMA is not set
-CONFIG_DMA_OF=y
+# CONFIG_DMADEVICES is not set
# CONFIG_AUXDISPLAY is not set
# CONFIG_UIO is not set
# CONFIG_VIRT_DRIVERS is not set
@@ -2166,7 +2112,6 @@
# CONFIG_ANDROID is not set
# CONFIG_USB_WPAN_HCD is not set
# CONFIG_WIMAX_GDM72XX is not set
-# CONFIG_CSR_WIFI is not set
# CONFIG_CED1401 is not set
# CONFIG_DGRP is not set
CONFIG_CLKDEV_LOOKUP=y
@@ -2184,9 +2129,9 @@
#
CONFIG_CLKSRC_OF=y
CONFIG_CLKSRC_MMIO=y
-CONFIG_TIMER_STB=y
CONFIG_ARM_ARCH_TIMER=y
-# CONFIG_ARM_GLOBAL_TIMER is not set
+CONFIG_ARM_GLOBAL_TIMER=y
+CONFIG_CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK=y
# CONFIG_MAILBOX is not set
# CONFIG_IOMMU_SUPPORT is not set
@@ -2528,10 +2473,9 @@
CONFIG_ARM_UNWIND=y
CONFIG_DEBUG_USER=y
CONFIG_DEBUG_LL=y
-# CONFIG_DEBUG_STB_UART1 is not set
-CONFIG_DEBUG_STB_UART2=y
+CONFIG_DEBUG_STB_UART1=y
+# CONFIG_DEBUG_STB_UART2 is not set
# CONFIG_DEBUG_STB_UART3 is not set
-# CONFIG_DEBUG_STB_UART4 is not set
# CONFIG_DEBUG_LL_UART_NONE is not set
# CONFIG_DEBUG_ICEDCC is not set
# CONFIG_DEBUG_SEMIHOSTING is not set
Loading…
Cancel
Save