| Message ID | 1444942061-23085-1-git-send-email-stefan.wahren@i2se.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 10/15/2015 02:47 PM, Stefan Wahren wrote: > Rebuild bcm2835_defconfig using "make bcm2835_defconfig; > make savedefconfig", and add the following features: > > * Enable all bcm2835-relevant drivers (MBOX, WDT, DMA, > PWM, SND) > * Re-enable some features to keep the current settings > (stackprotector, LED GPIO, LED triggers) Can you explain that second bullet a bit more? When regenerating defconfig files, it is quite common for entries not related to your changes to appear or disappear due to other changes in the kernel or some of the remove options being selected by some of the new options you enabled. To check what's going on, I usually do the following when editing defconfig: 1) Rebuild bcm2835_defconfig without editing the .config file at all (make bcm2835_defconfig; make savedefconfig; mv defconfig arch/arm/configs/bcm2835_defconfig; git commit). This allows me to see all the unrelated changes that will happen simply due to rebuilding the defconfig. You should double-check these, but likely ignore them. 2) Now edit the .config (e.g. make menuconfig) and re-generate the defconfig and commit. This change should now only include changes that are a direct result of your .config edits. To submit the patch, I often squash the two together after the separate validation.
Am 21.10.2015 um 04:32 schrieb Stephen Warren: > On 10/15/2015 02:47 PM, Stefan Wahren wrote: >> Rebuild bcm2835_defconfig using "make bcm2835_defconfig; >> make savedefconfig", and add the following features: >> >> * Enable all bcm2835-relevant drivers (MBOX, WDT, DMA, >> PWM, SND) >> * Re-enable some features to keep the current settings >> (stackprotector, LED GPIO, LED triggers) > > Can you explain that second bullet a bit more? Yes, the last update to bcm2835_defconfig was on 25th September 2014. So a little bit changed in the configs like renaming of options. After saving the defconfig i noticed that we "lost" 2 features with the new defconfig: * CONFIG_CC_STACKPROTECTOR because of renaming to CONFIG_CC_STACKPROTECTOR_REGULAR * CONFIG_LEDS_TRIGGER_HEARTBEAT because of the following new dependencies * CONFIG_NEW_LEDS * CONFIG_LEDS_CLASS * CONFIG_LEDS_TRIGGERS Do you want 2 separate patches (first update with re-enable and second with new bcm2835 stuff)? Best regards Stefan
On 10/21/2015 10:16 AM, Stefan Wahren wrote: > Am 21.10.2015 um 04:32 schrieb Stephen Warren: >> On 10/15/2015 02:47 PM, Stefan Wahren wrote: >>> Rebuild bcm2835_defconfig using "make bcm2835_defconfig; >>> make savedefconfig", and add the following features: >>> >>> * Enable all bcm2835-relevant drivers (MBOX, WDT, DMA, >>> PWM, SND) >>> * Re-enable some features to keep the current settings >>> (stackprotector, LED GPIO, LED triggers) >> >> Can you explain that second bullet a bit more? > > Yes, the last update to bcm2835_defconfig was on 25th September 2014. > So a little bit changed in the configs like renaming of options. > After saving the defconfig i noticed that we "lost" 2 features with > the new defconfig: > > * CONFIG_CC_STACKPROTECTOR because of renaming to > CONFIG_CC_STACKPROTECTOR_REGULAR > > * CONFIG_LEDS_TRIGGER_HEARTBEAT because of the following new dependencies > * CONFIG_NEW_LEDS > * CONFIG_LEDS_CLASS > * CONFIG_LEDS_TRIGGERS Ah OK. It'd be nice to have that in the patch description. > Do you want 2 separate patches (first update with re-enable and second > with new bcm2835 stuff)? It's probably fine as a single patch so long as all the changes (and reason why they're made) are described there.
diff --git a/arch/arm/configs/bcm2835_defconfig b/arch/arm/configs/bcm2835_defconfig index 31cb073..0fda844 100644 --- a/arch/arm/configs/bcm2835_defconfig +++ b/arch/arm/configs/bcm2835_defconfig @@ -10,7 +10,6 @@ CONFIG_CGROUP_FREEZER=y CONFIG_CGROUP_DEVICE=y CONFIG_CPUSETS=y CONFIG_CGROUP_CPUACCT=y -CONFIG_RESOURCE_COUNTERS=y CONFIG_CGROUP_PERF=y CONFIG_CFS_BANDWIDTH=y CONFIG_RT_GROUP_SCHED=y @@ -18,10 +17,6 @@ CONFIG_NAMESPACES=y CONFIG_SCHED_AUTOGROUP=y CONFIG_RELAY=y CONFIG_BLK_DEV_INITRD=y -CONFIG_RD_BZIP2=y -CONFIG_RD_LZMA=y -CONFIG_RD_XZ=y -CONFIG_RD_LZO=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_KALLSYMS_ALL=y CONFIG_EMBEDDED=y @@ -29,6 +24,7 @@ CONFIG_EMBEDDED=y CONFIG_PROFILING=y CONFIG_OPROFILE=y CONFIG_JUMP_LABEL=y +CONFIG_CC_STACKPROTECTOR_REGULAR=y CONFIG_ARCH_MULTI_V6=y # CONFIG_ARCH_MULTI_V7 is not set CONFIG_ARCH_BCM=y @@ -38,7 +34,6 @@ CONFIG_AEABI=y CONFIG_KSM=y CONFIG_CLEANCACHE=y CONFIG_SECCOMP=y -CONFIG_CC_STACKPROTECTOR=y CONFIG_KEXEC=y CONFIG_CRASH_DUMP=y CONFIG_VFP=y @@ -57,7 +52,6 @@ CONFIG_DEVTMPFS_MOUNT=y # CONFIG_STANDALONE is not set CONFIG_SCSI=y CONFIG_BLK_DEV_SD=y -CONFIG_SCSI_MULTI_LUN=y CONFIG_SCSI_CONSTANTS=y CONFIG_SCSI_SCAN_ASYNC=y CONFIG_NETDEVICES=y @@ -77,17 +71,27 @@ CONFIG_SPI=y CONFIG_SPI_BCM2835=y CONFIG_GPIO_SYSFS=y # CONFIG_HWMON is not set +CONFIG_WATCHDOG=y +CONFIG_BCM2835_WDT=y CONFIG_FB=y CONFIG_FB_SIMPLE=y CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y +CONFIG_SOUND=y +CONFIG_SND=y +CONFIG_SND_SOC=y +CONFIG_SND_BCM2835_SOC_I2S=y CONFIG_USB=y CONFIG_USB_STORAGE=y +CONFIG_USB_DWC2=y CONFIG_MMC=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_PLTFM=y CONFIG_MMC_SDHCI_BCM2835=y +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y CONFIG_LEDS_GPIO=y +CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=y CONFIG_LEDS_TRIGGER_ONESHOT=y CONFIG_LEDS_TRIGGER_HEARTBEAT=y @@ -96,17 +100,19 @@ CONFIG_LEDS_TRIGGER_GPIO=y CONFIG_LEDS_TRIGGER_DEFAULT_ON=y CONFIG_LEDS_TRIGGER_TRANSIENT=y CONFIG_LEDS_TRIGGER_CAMERA=y +CONFIG_DMADEVICES=y +CONFIG_DMA_BCM2835=y CONFIG_STAGING=y -CONFIG_USB_DWC2=y -CONFIG_USB_DWC2_HOST=y +CONFIG_MAILBOX=y +CONFIG_BCM2835_MBOX=y # CONFIG_IOMMU_SUPPORT is not set +CONFIG_PWM=y +CONFIG_PWM_BCM2835=y CONFIG_EXT2_FS=y CONFIG_EXT2_FS_XATTR=y CONFIG_EXT2_FS_POSIX_ACL=y CONFIG_EXT3_FS=y CONFIG_EXT3_FS_POSIX_ACL=y -CONFIG_EXT4_FS=y -CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_FANOTIFY=y CONFIG_MSDOS_FS=y CONFIG_VFAT_FS=y
Rebuild bcm2835_defconfig using "make bcm2835_defconfig; make savedefconfig", and add the following features: * Enable all bcm2835-relevant drivers (MBOX, WDT, DMA, PWM, SND) * Re-enable some features to keep the current settings (stackprotector, LED GPIO, LED triggers) Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com> --- arch/arm/configs/bcm2835_defconfig | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) This patch is only compile-tested.