bcm2835: Merge bcm2835_defconfig with bcmrpi_defconfig
These commands where used to make this commit:
./scripts/diffconfig -m arch/arm/configs/bcm2835_defconfig arch/arm/configs/bcmrpi_defconfig > merge.cfg
cat << EOF > filter
CONFIG_ARCH_BCM2708
CONFIG_BCM2708_DT
CONFIG_ARM_PATCH_PHYS_VIRT
CONFIG_PHYS_OFFSET
CONFIG_CMDLINE
CONFIG_BCM2708_WDT
CONFIG_HW_RANDOM_BCM2708
CONFIG_I2C_BCM2708
CONFIG_SPI_BCM2708
CONFIG_SND_BCM2708_SOC_I2S
CONFIG_USB_DWCOTG
CONFIG_LIRC_RPI
EOF
grep -F -v -f filter merge.cfg > filtered.cfg
cat << EOF > added.cfg
CONFIG_WATCHDOG=y
CONFIG_BCM2835_WDT=y
CONFIG_MISC_FILESYSTEMS=y
CONFIG_SND_BCM2835_SOC_I2S=m
EOF
ARCH=arm scripts/kconfig/merge_config.sh arch/arm/configs/bcm2835_defconfig filtered.cfg added.cfg
ARCH=arm make oldconfig
ARCH=arm make savedefconfig
cp defconfig arch/arm/configs/bcm2835_defconfig
rm merge.cfg filter filtered.cfg added.cfg defconfig
ARCH=arm make bcm2835_defconfig
ARCH=arm make oldconfig
Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
parent
7012d9ea
Please register or sign in to comment