Skip to content

Commit 94fbbc4

Browse files
committed
Fix regression in debug kernel config options
1 parent 123aab5 commit 94fbbc4

File tree

1 file changed

+14
-5
lines changed

1 file changed

+14
-5
lines changed

arch/arm/configs/bcmrpi_defconfig

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,19 @@ CONFIG_MODULE_SRCVERSION_ALL=y
2929
# CONFIG_BLK_DEV_BSG is not set
3030
CONFIG_BLK_DEV_THROTTLING=y
3131
CONFIG_CFQ_GROUP_IOSCHED=y
32-
CONFIG_PCI=y
32+
CONFIG_ARCH_BCM2708=y
3333
CONFIG_NO_HZ=y
3434
CONFIG_HIGH_RES_TIMERS=y
3535
CONFIG_PREEMPT=y
36-
CONFIG_HIGHMEM=y
36+
CONFIG_AEABI=y
3737
CONFIG_SECCOMP=y
3838
CONFIG_CC_STACKPROTECTOR=y
39+
CONFIG_ZBOOT_ROM_TEXT=0x0
40+
CONFIG_ZBOOT_ROM_BSS=0x0
41+
CONFIG_CMDLINE="dwc_otg.lpm_enable=0 console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 root=/dev/mmcblk0p2 rootfstype=ext3 rootwait"
3942
CONFIG_KEXEC=y
4043
CONFIG_CPU_IDLE=y
44+
CONFIG_VFP=y
4145
CONFIG_BINFMT_MISC=m
4246
CONFIG_NET=y
4347
CONFIG_PACKET=y
@@ -208,14 +212,14 @@ CONFIG_GAMEPORT_L4=m
208212
CONFIG_VT_HW_CONSOLE_BINDING=y
209213
# CONFIG_LEGACY_PTYS is not set
210214
# CONFIG_DEVKMEM is not set
215+
CONFIG_SERIAL_AMBA_PL011=y
216+
CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
211217
# CONFIG_HW_RANDOM is not set
212218
CONFIG_RAW_DRIVER=y
213-
CONFIG_GPIOLIB=y
214219
CONFIG_GPIO_SYSFS=y
215-
CONFIG_POWER_SUPPLY=y
216220
# CONFIG_HWMON is not set
217-
CONFIG_THERMAL=y
218221
CONFIG_WATCHDOG=y
222+
CONFIG_BCM2708_WDT=m
219223
# CONFIG_MFD_SUPPORT is not set
220224
CONFIG_MEDIA_SUPPORT=m
221225
CONFIG_VIDEO_DEV=m
@@ -264,11 +268,13 @@ CONFIG_USB_GSPCA_VC032X=m
264268
CONFIG_USB_GSPCA_VICAM=m
265269
CONFIG_USB_GSPCA_XIRLINK_CIT=m
266270
CONFIG_USB_GSPCA_ZC3XX=m
271+
CONFIG_VIDEO_HDPVR=m
267272
CONFIG_USB_PWC=m
268273
CONFIG_USB_ZR364XX=m
269274
CONFIG_USB_STKWEBCAM=m
270275
CONFIG_USB_S2255=m
271276
CONFIG_FB=y
277+
CONFIG_FB_BCM2708=y
272278
CONFIG_FRAMEBUFFER_CONSOLE=y
273279
CONFIG_LOGO=y
274280
# CONFIG_LOGO_LINUX_MONO is not set
@@ -287,6 +293,7 @@ CONFIG_SND_VIRMIDI=m
287293
CONFIG_SND_MTPAV=m
288294
CONFIG_SND_SERIAL_U16550=m
289295
CONFIG_SND_MPU401=m
296+
CONFIG_SND_BCM2835=m
290297
CONFIG_SND_USB_AUDIO=m
291298
CONFIG_SND_USB_UA101=m
292299
CONFIG_SND_USB_CAIAQ=m
@@ -432,6 +439,8 @@ CONFIG_USB_YUREX=m
432439
CONFIG_MMC=y
433440
CONFIG_MMC_SDHCI=y
434441
CONFIG_MMC_SDHCI_PLTFM=y
442+
CONFIG_MMC_SDHCI_BCM2708=y
443+
CONFIG_MMC_SDHCI_BCM2708_DMA=y
435444
CONFIG_LEDS_GPIO=y
436445
CONFIG_LEDS_TRIGGER_TIMER=m
437446
CONFIG_LEDS_TRIGGER_HEARTBEAT=m

0 commit comments

Comments
 (0)