bsp/rpi3: move common settings to a common file

Will be used by a follow up commit that will add raspberrypi3 (32-bit)
support.

Signed-off-by: Ricardo Salveti <ricardo@foundries.io>

4 files changed, 142 insertions, 138 deletions

diff --git a/bsp/raspberrypi/raspberrypi3-64.cfg b/bsp/raspberrypi/raspberrypi3-64.cfg
index 5d8533c..c11b2af 100644
--- a/bsp/raspberrypi/raspberrypi3-64.cfg
+++ b/bsp/raspberrypi/raspberrypi3-64.cfg
@@ -1,98 +1,4 @@
-CONFIG_SMP=y
-CONFIG_COMPAT=y
-CONFIG_SCHED_MC=y
-CONFIG_NR_CPUS=4
-CONFIG_HZ_1000=y
-CONFIG_ARCH_BCM2835=y
-# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
-# CONFIG_SERIAL_8250_DMA is not set
-CONFIG_SERIAL_8250_NR_UARTS=1
-CONFIG_SERIAL_8250_RUNTIME_UARTS=0
-CONFIG_SERIAL_8250_EXTENDED=y
-CONFIG_SERIAL_8250_SHARE_IRQ=y
-CONFIG_SERIAL_8250_BCM2835AUX=y
-CONFIG_SERIAL_OF_PLATFORM=y
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_INPUT_AD714X=m
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_KEYBOARD_ATKBD is not set
-CONFIG_TOUCHSCREEN_ADS7846=m
-CONFIG_TOUCHSCREEN_RPI_FT5406=m
-CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
-CONFIG_FB=y
-CONFIG_FB_UDL=m
-CONFIG_FB_SSD1307=m
-CONFIG_FB_RPISENSE=m
-CONFIG_CMA=y
-CONFIG_DMA_CMA=y
-CONFIG_CMA_SIZE_MBYTES=64
-CONFIG_RANDOMIZE_BASE=y
-CONFIG_ARM_CPUIDLE=y
-CONFIG_BRCM_CHAR_DRIVERS=y
-CONFIG_BCM_VCIO=y
-CONFIG_BCM2835_DEVGPIOMEM=y
-# CONFIG_BCM2835_SMI_DEV is not set
-CONFIG_I2C_BCM2835=y
-CONFIG_I2C_BCM2708=m
-CONFIG_SPI_GPIO=m
-CONFIG_SPI_BCM2835=m
-CONFIG_SPI_BCM2835AUX=m
-CONFIG_THERMAL=y
-CONFIG_BCM2835_THERMAL=y
-CONFIG_BCM2835_WDT=y
-CONFIG_DRM=m
-CONFIG_DRM_FBDEV_EMULATION=y
-CONFIG_DRM_PANEL_SIMPLE=m
-CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m
-CONFIG_DRM_VC4=m
-CONFIG_DRM_VC4_HDMI_CEC=y
-CONFIG_SOUND=y
-CONFIG_SND=y
-CONFIG_SND_SOC=y
-CONFIG_SND_BCM2835=m
-CONFIG_SND_BCM2835_SOC_I2S=m
-CONFIG_MMC_BLOCK_MINORS=32
-CONFIG_MMC_BCM2835=y
-CONFIG_MMC_BCM2835_MMC=y
-CONFIG_MMC_BCM2835_DMA=y
-CONFIG_MMC_BCM2835_PIO_DMA_BARRIER=2
-CONFIG_MMC_BCM2835_SDHOST=y
-CONFIG_MMC_SPI=m
-CONFIG_DMADEVICES=y
-CONFIG_DMA_BCM2835=y
-CONFIG_DMA_BCM2708=y
-CONFIG_MAILBOX=y
-CONFIG_BCM2835_MBOX=y
-CONFIG_RASPBERRYPI_POWER=y
-CONFIG_RASPBERRYPI_FIRMWARE=y
-CONFIG_BCM2835_VCHIQ=y
-CONFIG_VIDEO_BCM2835=m
-CONFIG_RPI_AXIPERF=m
 # CONFIG_CAVIUM_ERRATUM_22375 is not set
 # CONFIG_CAVIUM_ERRATUM_23154 is not set
 # CONFIG_CAVIUM_ERRATUM_27456 is not set
-# CONFIG_SUSPEND is not set
-CONFIG_CPUFREQ_DT=y
-CONFIG_CPUFREQ_DT_PLATDEV=y
-CONFIG_GPIO_SYSFS=y
-CONFIG_GPIO_BCM_EXP=y
-CONFIG_GPIO_BCM_VIRT=y
-CONFIG_I2C_GPIO=m
-CONFIG_POWER_RESET=y
-CONFIG_POWER_RESET_GPIO=y
-CONFIG_USB_XHCI_PLATFORM=y
-CONFIG_USB_DWC2=y
-CONFIG_USB_DWCOTG=y
-CONFIG_OF_CONFIGFS=y
-CONFIG_HW_RANDOM_BCM2835=y
-CONFIG_PWM_BCM2835=m
-CONFIG_BOOT_PRINTK_DELAY=y
-# CONFIG_IOMMU_SUPPORT is not set
-# CONFIG_BACKLIGHT_GENERIC is not set
-CONFIG_BACKLIGHT_RPI=m
-CONFIG_BACKLIGHT_GPIO=m
-CONFIG_BRCMFMAC=m
-CONFIG_BRCMFMAC_USB=y
-CONFIG_BRCMFMAC_SDIO=y
-CONFIG_BRCMUTIL=m
-CONFIG_SENSORS_RPI_POE_FAN=m
+CONFIG_COMPAT=y
diff --git a/bsp/raspberrypi/raspberrypi3-64.scc b/bsp/raspberrypi/raspberrypi3-64.scc
index e200887..3888d0a 100644
--- a/bsp/raspberrypi/raspberrypi3-64.scc
+++ b/bsp/raspberrypi/raspberrypi3-64.scc
@@ -1,47 +1,5 @@
-include cfg/8250.scc
-include cfg/amba.scc
-
-include features/hrt/hrt.scc
-
-kconf hardware bsp/common-pc/common-pc-drivers.cfg
-kconf hardware bsp/common-pc/common-pc-gfx.cfg
-
-include features/usb/xhci-hcd.scc
-
-include features/mmc/mmc-sdhci.scc
-
-# Various RF/Wireless technologies
-include features/bluetooth/bluetooth.scc
-include features/bluetooth/bluetooth-usb.scc
-include features/bluetooth/bluetooth-uart.scc
-include features/ieee802154/ieee802154.scc
-include features/mac802154/mac802154.scc
-include features/hostapd/hostapd.scc
-
-# Media
-include cfg/sound.scc
-include features/media/media.scc
-include features/media/media-usb-webcams.scc
-
-# Subsystems and interfaces
-include features/hugetlb/hugetlb.scc
-include features/i2c/i2cdev.scc
-include features/leds/leds.scc
-include features/spi/spidev.scc
-
-# Miscellaneous
-include cfg/dmaengine.scc
-include features/hid/hid.scc
-include features/input/input.scc
-include features/input/touchscreen.scc
-include features/input/keyboard-gpio.scc
-include features/usb/serial-all.scc
-include features/usb-net/usb-net.scc
-include features/tft/tft.scc
-include features/pwm/pwm.scc
 include features/crypto/arm64-crypto.scc
-include features/power/cpu-freq.scc
 
-include cfg/usb-mass-storage.scc
+include raspberrypi3-common.scc
 
 kconf hardware raspberrypi3-64.cfg
diff --git a/bsp/raspberrypi/raspberrypi3-common.cfg b/bsp/raspberrypi/raspberrypi3-common.cfg
new file mode 100644
index 0000000..db041ab
--- /dev/null
+++ b/bsp/raspberrypi/raspberrypi3-common.cfg
@@ -0,0 +1,94 @@
+CONFIG_SMP=y
+CONFIG_SCHED_MC=y
+CONFIG_NR_CPUS=4
+CONFIG_HZ_1000=y
+CONFIG_ARCH_BCM2835=y
+# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
+# CONFIG_SERIAL_8250_DMA is not set
+CONFIG_SERIAL_8250_NR_UARTS=1
+CONFIG_SERIAL_8250_RUNTIME_UARTS=0
+CONFIG_SERIAL_8250_EXTENDED=y
+CONFIG_SERIAL_8250_SHARE_IRQ=y
+CONFIG_SERIAL_8250_BCM2835AUX=y
+CONFIG_SERIAL_OF_PLATFORM=y
+CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_INPUT_AD714X=m
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_KEYBOARD_ATKBD is not set
+CONFIG_TOUCHSCREEN_ADS7846=m
+CONFIG_TOUCHSCREEN_RPI_FT5406=m
+CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
+CONFIG_FB=y
+CONFIG_FB_UDL=m
+CONFIG_FB_SSD1307=m
+CONFIG_FB_RPISENSE=m
+CONFIG_CMA=y
+CONFIG_DMA_CMA=y
+CONFIG_CMA_SIZE_MBYTES=64
+CONFIG_RANDOMIZE_BASE=y
+CONFIG_ARM_CPUIDLE=y
+CONFIG_BRCM_CHAR_DRIVERS=y
+CONFIG_BCM_VCIO=y
+CONFIG_BCM2835_DEVGPIOMEM=y
+# CONFIG_BCM2835_SMI_DEV is not set
+CONFIG_I2C_BCM2835=y
+CONFIG_I2C_BCM2708=m
+CONFIG_SPI_GPIO=m
+CONFIG_SPI_BCM2835=m
+CONFIG_SPI_BCM2835AUX=m
+CONFIG_THERMAL=y
+CONFIG_BCM2835_THERMAL=y
+CONFIG_BCM2835_WDT=y
+CONFIG_DRM=m
+CONFIG_DRM_FBDEV_EMULATION=y
+CONFIG_DRM_PANEL_SIMPLE=m
+CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m
+CONFIG_DRM_VC4=m
+CONFIG_DRM_VC4_HDMI_CEC=y
+CONFIG_SOUND=y
+CONFIG_SND=y
+CONFIG_SND_SOC=y
+CONFIG_SND_BCM2835=m
+CONFIG_SND_BCM2835_SOC_I2S=m
+CONFIG_MMC_BLOCK_MINORS=32
+CONFIG_MMC_BCM2835=y
+CONFIG_MMC_BCM2835_MMC=y
+CONFIG_MMC_BCM2835_DMA=y
+CONFIG_MMC_BCM2835_PIO_DMA_BARRIER=2
+CONFIG_MMC_BCM2835_SDHOST=y
+CONFIG_MMC_SPI=m
+CONFIG_DMADEVICES=y
+CONFIG_DMA_BCM2835=y
+CONFIG_DMA_BCM2708=y
+CONFIG_MAILBOX=y
+CONFIG_BCM2835_MBOX=y
+CONFIG_RASPBERRYPI_POWER=y
+CONFIG_RASPBERRYPI_FIRMWARE=y
+CONFIG_BCM2835_VCHIQ=y
+CONFIG_VIDEO_BCM2835=m
+CONFIG_RPI_AXIPERF=m
+# CONFIG_SUSPEND is not set
+CONFIG_CPUFREQ_DT=y
+CONFIG_CPUFREQ_DT_PLATDEV=y
+CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_BCM_EXP=y
+CONFIG_GPIO_BCM_VIRT=y
+CONFIG_I2C_GPIO=m
+CONFIG_POWER_RESET=y
+CONFIG_POWER_RESET_GPIO=y
+CONFIG_USB_XHCI_PLATFORM=y
+CONFIG_USB_DWC2=y
+CONFIG_USB_DWCOTG=y
+CONFIG_OF_CONFIGFS=y
+CONFIG_HW_RANDOM_BCM2835=y
+CONFIG_PWM_BCM2835=m
+CONFIG_BOOT_PRINTK_DELAY=y
+# CONFIG_IOMMU_SUPPORT is not set
+# CONFIG_BACKLIGHT_GENERIC is not set
+CONFIG_BACKLIGHT_RPI=m
+CONFIG_BACKLIGHT_GPIO=m
+CONFIG_BRCMFMAC=m
+CONFIG_BRCMFMAC_USB=y
+CONFIG_BRCMFMAC_SDIO=y
+CONFIG_BRCMUTIL=m
+CONFIG_SENSORS_RPI_POE_FAN=m
diff --git a/bsp/raspberrypi/raspberrypi3-common.scc b/bsp/raspberrypi/raspberrypi3-common.scc
new file mode 100644
index 0000000..97a371b
--- /dev/null
+++ b/bsp/raspberrypi/raspberrypi3-common.scc
@@ -0,0 +1,46 @@
+include cfg/8250.scc
+include cfg/amba.scc
+
+include features/hrt/hrt.scc
+
+kconf hardware bsp/common-pc/common-pc-drivers.cfg
+kconf hardware bsp/common-pc/common-pc-gfx.cfg
+
+include features/usb/xhci-hcd.scc
+
+include features/mmc/mmc-sdhci.scc
+
+# Various RF/Wireless technologies
+include features/bluetooth/bluetooth.scc
+include features/bluetooth/bluetooth-usb.scc
+include features/bluetooth/bluetooth-uart.scc
+include features/ieee802154/ieee802154.scc
+include features/mac802154/mac802154.scc
+include features/hostapd/hostapd.scc
+
+# Media
+include cfg/sound.scc
+include features/media/media.scc
+include features/media/media-usb-webcams.scc
+
+# Subsystems and interfaces
+include features/hugetlb/hugetlb.scc
+include features/i2c/i2cdev.scc
+include features/leds/leds.scc
+include features/spi/spidev.scc
+
+# Miscellaneous
+include cfg/dmaengine.scc
+include features/hid/hid.scc
+include features/input/input.scc
+include features/input/touchscreen.scc
+include features/input/keyboard-gpio.scc
+include features/usb/serial-all.scc
+include features/usb-net/usb-net.scc
+include features/tft/tft.scc
+include features/pwm/pwm.scc
+include features/power/cpu-freq.scc
+
+include cfg/usb-mass-storage.scc
+
+kconf hardware raspberrypi3-common.cfg