Previous updates enabled config options that do not make sense on ARMv6. ARMv6 default flavor is actually just a RPi1 kernel, so enabling platform support for hardware that is unavailable there and that conflicts with the Rpi drivers should not be done. This causes the kernel to boot again on a Rpi1. --- config/armv6hl/default | 42 +++++------------------------------------- 1 file changed, 5 insertions(+), 37 deletions(-) diff --git a/config/armv6hl/default b/config/armv6hl/default index b74f04b..877caef 100644 --- a/config/armv6hl/default +++ b/config/armv6hl/default @@ -362,15 +362,7 @@ CONFIG_ARCH_BCM=y CONFIG_ARCH_BCM2835=y CONFIG_ARCH_CNS3XXX=y CONFIG_MACH_CNS3420VB=y -CONFIG_ARCH_INTEGRATOR=y - -# -# Integrator Options -# -CONFIG_ARCH_INTEGRATOR_AP=y -CONFIG_ARCH_INTEGRATOR_CP=y -CONFIG_ARCH_CINTEGRATOR=y -CONFIG_INTEGRATOR_IMPD1=y +# CONFIG_ARCH_INTEGRATOR is not set CONFIG_ARCH_MXC=y CONFIG_MXC_AVIC=y CONFIG_MXC_DEBUG_BOARD=y @@ -434,7 +426,6 @@ CONFIG_IMX_HAVE_PLATFORM_SPI_IMX=y CONFIG_ARCH_PICOXCELL=y CONFIG_ARCH_VT8500=y CONFIG_ARCH_WM8750=y -CONFIG_PLAT_VERSATILE=y CONFIG_ARM_TIMER_SP804=y # @@ -478,7 +469,6 @@ CONFIG_MULTI_IRQ_HANDLER=y # CONFIG_ARM_ERRATA_326103 is not set CONFIG_ARM_ERRATA_411920=y # CONFIG_ARM_ERRATA_364296 is not set -CONFIG_ICST=y # # Bus support @@ -599,7 +589,6 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y # CONFIG_CPUFREQ_DT=m # CONFIG_ARM_IMX6Q_CPUFREQ is not set -CONFIG_ARM_INTEGRATOR=y # CONFIG_ARM_KIRKWOOD_CPUFREQ is not set # @@ -1770,7 +1759,6 @@ CONFIG_SENSORS_APDS990X=m CONFIG_HMC6352=m CONFIG_DS1682=m # CONFIG_TI_DAC7512 is not set -# CONFIG_ARM_CHARLCD is not set # CONFIG_BMP085_I2C is not set # CONFIG_BMP085_SPI is not set CONFIG_USB_SWITCH_FSA9480=m @@ -2660,21 +2648,12 @@ CONFIG_DEVKMEM=y # Serial drivers # CONFIG_SERIAL_EARLYCON=y -CONFIG_SERIAL_8250=y -# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_8250_DMA=y -CONFIG_SERIAL_8250_NR_UARTS=32 -CONFIG_SERIAL_8250_RUNTIME_UARTS=32 -# CONFIG_SERIAL_8250_EXTENDED is not set -# CONFIG_SERIAL_8250_DW is not set -# CONFIG_SERIAL_8250_EM is not set +# CONFIG_SERIAL_8250 is not set # # Non-8250 serial port support # -CONFIG_SERIAL_AMBA_PL010=y -CONFIG_SERIAL_AMBA_PL010_CONSOLE=y +# CONFIG_SERIAL_AMBA_PL010 is not set CONFIG_SERIAL_AMBA_PL011=y CONFIG_SERIAL_AMBA_PL011_CONSOLE=y # CONFIG_SERIAL_EARLYCON_ARM_SEMIHOST is not set @@ -2688,7 +2667,6 @@ CONFIG_SERIAL_CORE_CONSOLE=y CONFIG_CONSOLE_POLL=y CONFIG_SERIAL_VT8500=y CONFIG_SERIAL_VT8500_CONSOLE=y -CONFIG_SERIAL_OF_PLATFORM=m # CONFIG_SERIAL_SCCNXP is not set # CONFIG_SERIAL_SC16IS7XX is not set # CONFIG_SERIAL_BCM63XX is not set @@ -4046,8 +4024,6 @@ CONFIG_HDMI=y # # Console display driver support # -CONFIG_VGA_CONSOLE=y -# CONFIG_VGACON_SOFT_SCROLLBACK is not set CONFIG_DUMMY_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y @@ -4951,9 +4927,6 @@ CONFIG_COMMON_CLK=y # Common Clock Framework # CONFIG_COMMON_CLK_WM831X=m -CONFIG_COMMON_CLK_VERSATILE=y -# CONFIG_CLK_SP810 is not set -# CONFIG_CLK_VEXPRESS_OSC is not set CONFIG_COMMON_CLK_MAX_GEN=y CONFIG_COMMON_CLK_MAX77686=m # CONFIG_COMMON_CLK_MAX77802 is not set @@ -5000,7 +4973,6 @@ CONFIG_IOMMU_SUPPORT=y # SOC (System On Chip) specific Drivers # CONFIG_SOC_TI=y -CONFIG_SOC_INTEGRATOR_CM=y CONFIG_PM_DEVFREQ=y # @@ -5221,8 +5193,6 @@ CONFIG_IRQCHIP=y CONFIG_ARM_GIC=y CONFIG_ARM_VIC=y CONFIG_ARM_VIC_NR=2 -CONFIG_VERSATILE_FPGA_IRQ=y -CONFIG_VERSATILE_FPGA_IRQ_NR=4 # CONFIG_IPACK_BUS is not set CONFIG_RESET_CONTROLLER=y # CONFIG_FMC is not set @@ -5733,12 +5703,10 @@ CONFIG_ARM_UNWIND=y CONFIG_DEBUG_USER=y # CONFIG_DEBUG_LL is not set CONFIG_DEBUG_IMX_UART_PORT=1 -CONFIG_DEBUG_LL_INCLUDE="debug/pl01x.S" -CONFIG_DEBUG_UART_PL01X=y +CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S" +# CONFIG_DEBUG_UART_PL01X is not set # CONFIG_DEBUG_UART_8250 is not set # CONFIG_DEBUG_UART_BCM63XX is not set -CONFIG_DEBUG_UART_PHYS=0x16000000 -CONFIG_DEBUG_UART_VIRT=0xf1600000 CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h" # CONFIG_ARM_KPROBES_TEST is not set # CONFIG_PID_IN_CONTEXTIDR is not set -- 2.0.4 -- To unsubscribe, e-mail: opensuse-kernel+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-kernel+owner@opensuse.org