diff mbox

[v2,5/9] arm64: Add BCM2835 support to the defconfig.

Message ID 1464934708-24769-6-git-send-email-kraxel@redhat.com (mailing list archive)
State New, archived
Headers show

Commit Message

Gerd Hoffmann June 3, 2016, 6:18 a.m. UTC 
From: Eric Anholt <eric@anholt.net>

Made with make defconfig; make menuconfig (only saying Y to new
entries); make savedefconfig.

Signed-off-by: Eric Anholt <eric@anholt.net>

[ kraxel: quick+dirty rebase to 4.7 ]

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 arch/arm64/configs/defconfig | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

Comments

Arnd Bergmann June 3, 2016, 7:36 a.m. UTC | #1 
On Friday, June 3, 2016 8:18:24 AM CEST Gerd Hoffmann wrote:
> From: Eric Anholt <eric@anholt.net>
> 
> Made with make defconfig; make menuconfig (only saying Y to new
> entries); make savedefconfig.

Please try not to mix 'make savedefconfig' changes with your
own changes, it make it harder to review and can lead to more
conflicts.

> @@ -140,6 +141,9 @@ CONFIG_USB_NET_PLUSB=m
>  CONFIG_USB_NET_MCS7830=m
>  CONFIG_WL18XX=m
>  CONFIG_WLCORE_SDIO=m
> +CONFIG_USB_USBNET=y
> +CONFIG_USB_NET_SMSC95XX=y
> +# CONFIG_WLAN is not set
>  CONFIG_INPUT_EVDEV=y
>  CONFIG_KEYBOARD_GPIO=y

Can this be =m like the others?

> -CONFIG_FB=y
> -CONFIG_FRAMEBUFFER_CONSOLE=y

Is this intended?

> +CONFIG_DRM=y
> +CONFIG_DRM_VC4=y
>  CONFIG_FB_ARMCLCD=y
>  CONFIG_LOGO=y

Maybe modules?


>  # CONFIG_LOGO_LINUX_MONO is not set
>  # CONFIG_LOGO_LINUX_VGA16 is not set
>  CONFIG_SOUND=y
>  CONFIG_SND=y
>  CONFIG_SND_SOC=y
> +CONFIG_SND_BCM2835_SOC_I2S=y
>  CONFIG_SND_SOC_RCAR=y
>  CONFIG_SND_SOC_AK4613=y
>  CONFIG_USB=y

We probably want CONFIG_SND=m, but that should be a separate patch.

> @@ -270,6 +284,7 @@ CONFIG_RTC_DRV_SUN6I=y
>  CONFIG_RTC_DRV_XGENE=y
>  CONFIG_DMADEVICES=y
>  CONFIG_PL330_DMA=y
> +CONFIG_DMA_BCM2835=y
>  CONFIG_TEGRA20_APB_DMA=y
>  CONFIG_QCOM_BAM_DMA=y
>  CONFIG_RCAR_DMAC=y

Does any essential driver depend on this one?

> @@ -311,7 +329,6 @@ CONFIG_AUTOFS4_FS=y
>  CONFIG_FUSE_FS=y
>  CONFIG_CUSE=y
>  CONFIG_VFAT_FS=y
> -CONFIG_TMPFS=y
>  CONFIG_HUGETLBFS=y
>  CONFIG_CONFIGFS_FS=y
>  CONFIG_EFIVAR_FS=y

Why?

	Arnd
Gerd Hoffmann June 3, 2016, 8:50 a.m. UTC | #2 
On Fr, 2016-06-03 at 09:36 +0200, Arnd Bergmann wrote:
> On Friday, June 3, 2016 8:18:24 AM CEST Gerd Hoffmann wrote:
> > From: Eric Anholt <eric@anholt.net>
> > 
> > Made with make defconfig; make menuconfig (only saying Y to new
> > entries); make savedefconfig.
> 
> Please try not to mix 'make savedefconfig' changes with your
> own changes, it make it harder to review and can lead to more
> conflicts.

This is just conflicts resolved by hand after 4.6 -> 4.7-rc1 rebase,
latest version didn't actually ran through savedefconfig.  Probably some
unwanted changes made it in by accident this way.

Guess I better redo this from scratch.

What is the suggested procedure to generate defconfig patches?

cheers,
  Gerd
Arnd Bergmann June 3, 2016, 8:58 a.m. UTC | #3 
On Friday, June 3, 2016 10:50:16 AM CEST Gerd Hoffmann wrote:
> On Fr, 2016-06-03 at 09:36 +0200, Arnd Bergmann wrote:
> > On Friday, June 3, 2016 8:18:24 AM CEST Gerd Hoffmann wrote:
> > > From: Eric Anholt <eric@anholt.net>
> > > 
> > > Made with make defconfig; make menuconfig (only saying Y to new
> > > entries); make savedefconfig.
> > 
> > Please try not to mix 'make savedefconfig' changes with your
> > own changes, it make it harder to review and can lead to more
> > conflicts.
> 
> This is just conflicts resolved by hand after 4.6 -> 4.7-rc1 rebase,
> latest version didn't actually ran through savedefconfig.  Probably some
> unwanted changes made it in by accident this way.
> 
> Guess I better redo this from scratch.
> 
> What is the suggested procedure to generate defconfig patches?

I tend to just edit the files by hand, or use 'make savedefconfig' to
create an initial version, and then use 'vimdiff' to revert the changes
I don't want.

	Arnd
Gerd Hoffmann June 3, 2016, 9:53 a.m. UTC | #4 
Hi,

> > @@ -311,7 +329,6 @@ CONFIG_AUTOFS4_FS=y
> >  CONFIG_FUSE_FS=y
> >  CONFIG_CUSE=y
> >  CONFIG_VFAT_FS=y
> > -CONFIG_TMPFS=y
> >  CONFIG_HUGETLBFS=y
> >  CONFIG_CONFIGFS_FS=y
> >  CONFIG_EFIVAR_FS=y
> 
> Why?

That seems to come from enabling drm+vc4, probably something does
"select TMPFS".

cheers,
  Gerd
Eric Anholt June 7, 2016, 10:16 p.m. UTC | #5 
Arnd Bergmann <arnd@arndb.de> writes:

> On Friday, June 3, 2016 8:18:24 AM CEST Gerd Hoffmann wrote:
>> From: Eric Anholt <eric@anholt.net>
>> 
>> Made with make defconfig; make menuconfig (only saying Y to new
>> entries); make savedefconfig.
>
> Please try not to mix 'make savedefconfig' changes with your
> own changes, it make it harder to review and can lead to more
> conflicts.
>
>> @@ -140,6 +141,9 @@ CONFIG_USB_NET_PLUSB=m
>>  CONFIG_USB_NET_MCS7830=m
>>  CONFIG_WL18XX=m
>>  CONFIG_WLCORE_SDIO=m
>> +CONFIG_USB_USBNET=y
>> +CONFIG_USB_NET_SMSC95XX=y
>> +# CONFIG_WLAN is not set
>>  CONFIG_INPUT_EVDEV=y
>>  CONFIG_KEYBOARD_GPIO=y
>
> Can this be =m like the others?

I guess, but it's an on-board device and I was assuming =m was about
whether the device is always present on the board being added.

>> -CONFIG_FB=y
>> -CONFIG_FRAMEBUFFER_CONSOLE=y
>
> Is this intended?
>
>> +CONFIG_DRM=y
>> +CONFIG_DRM_VC4=y
>>  CONFIG_FB_ARMCLCD=y
>>  CONFIG_LOGO=y
>
> Maybe modules?

It looks like in multi_v7_defconfig we have CONFIG_DRM=y but
CONFIG_DRM_*=m, so should we be consistent with that?

>>  # CONFIG_LOGO_LINUX_MONO is not set
>>  # CONFIG_LOGO_LINUX_VGA16 is not set
>>  CONFIG_SOUND=y
>>  CONFIG_SND=y
>>  CONFIG_SND_SOC=y
>> +CONFIG_SND_BCM2835_SOC_I2S=y
>>  CONFIG_SND_SOC_RCAR=y
>>  CONFIG_SND_SOC_AK4613=y
>>  CONFIG_USB=y
>
> We probably want CONFIG_SND=m, but that should be a separate patch.
>
>> @@ -270,6 +284,7 @@ CONFIG_RTC_DRV_SUN6I=y
>>  CONFIG_RTC_DRV_XGENE=y
>>  CONFIG_DMADEVICES=y
>>  CONFIG_PL330_DMA=y
>> +CONFIG_DMA_BCM2835=y
>>  CONFIG_TEGRA20_APB_DMA=y
>>  CONFIG_QCOM_BAM_DMA=y
>>  CONFIG_RCAR_DMAC=y
>
> Does any essential driver depend on this one?

bcm2835-sdhost and vc4 will eventually.

>> @@ -311,7 +329,6 @@ CONFIG_AUTOFS4_FS=y
>>  CONFIG_FUSE_FS=y
>>  CONFIG_CUSE=y
>>  CONFIG_VFAT_FS=y
>> -CONFIG_TMPFS=y
>>  CONFIG_HUGETLBFS=y
>>  CONFIG_CONFIGFS_FS=y
>>  CONFIG_EFIVAR_FS=y
>
> Why?

DRM was selecting it, so savedefconfig dropped it.
diff mbox

Patch

diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index fd2d74d..03f246a 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -31,6 +31,7 @@  CONFIG_MODULE_UNLOAD=y
 # CONFIG_IOSCHED_DEADLINE is not set
 CONFIG_ARCH_SUNXI=y
 CONFIG_ARCH_ALPINE=y
+CONFIG_ARCH_BCM2835=y
 CONFIG_ARCH_BCM_IPROC=y
 CONFIG_ARCH_BERLIN=y
 CONFIG_ARCH_EXYNOS=y
@@ -140,6 +141,9 @@  CONFIG_USB_NET_PLUSB=m
 CONFIG_USB_NET_MCS7830=m
 CONFIG_WL18XX=m
 CONFIG_WLCORE_SDIO=m
+CONFIG_USB_USBNET=y
+CONFIG_USB_NET_SMSC95XX=y
+# CONFIG_WLAN is not set
 CONFIG_INPUT_EVDEV=y
 CONFIG_KEYBOARD_GPIO=y
 # CONFIG_SERIO_SERPORT is not set
@@ -147,6 +151,9 @@  CONFIG_SERIO_AMBAKMI=y
 CONFIG_LEGACY_PTY_COUNT=16
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_EXTENDED=y
+CONFIG_SERIAL_8250_SHARE_IRQ=y
+CONFIG_SERIAL_8250_BCM2835AUX=y
 CONFIG_SERIAL_8250_DW=y
 CONFIG_SERIAL_8250_MT6577=y
 CONFIG_SERIAL_8250_UNIPHIER=y
@@ -173,6 +180,7 @@  CONFIG_I2C_MUX=y
 CONFIG_I2C_MUX_PCA954x=y
 CONFIG_I2C_DESIGNWARE_PLATFORM=y
 CONFIG_I2C_IMX=y
+CONFIG_I2C_BCM2835=y
 CONFIG_I2C_MV64XXX=y
 CONFIG_I2C_QUP=y
 CONFIG_I2C_TEGRA=y
@@ -180,6 +188,8 @@  CONFIG_I2C_UNIPHIER_F=y
 CONFIG_I2C_RCAR=y
 CONFIG_SPI=y
 CONFIG_SPI_ORION=y
+CONFIG_SPI_BCM2835=y
+CONFIG_SPI_BCM2835AUX=y
 CONFIG_SPI_PL022=y
 CONFIG_SPI_QUP=y
 CONFIG_SPI_SPIDEV=m
@@ -206,20 +216,24 @@  CONFIG_MFD_SPMI_PMIC=y
 CONFIG_MFD_SEC_CORE=y
 CONFIG_MFD_HI655X_PMIC=y
 CONFIG_REGULATOR=y
+CONFIG_BCM2835_WDT=y
+CONFIG_MFD_SPMI_PMIC=y
+CONFIG_MFD_SEC_CORE=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_REGULATOR_HI655X=y
 CONFIG_REGULATOR_QCOM_SMD_RPM=y
 CONFIG_REGULATOR_QCOM_SPMI=y
 CONFIG_REGULATOR_S2MPS11=y
-CONFIG_FB=y
+CONFIG_DRM=y
+CONFIG_DRM_VC4=y
 CONFIG_FB_ARMCLCD=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_LOGO=y
 # CONFIG_LOGO_LINUX_MONO is not set
 # CONFIG_LOGO_LINUX_VGA16 is not set
 CONFIG_SOUND=y
 CONFIG_SND=y
 CONFIG_SND_SOC=y
+CONFIG_SND_BCM2835_SOC_I2S=y
 CONFIG_SND_SOC_RCAR=y
 CONFIG_SND_SOC_AK4613=y
 CONFIG_USB=y
@@ -270,6 +284,7 @@  CONFIG_RTC_DRV_SUN6I=y
 CONFIG_RTC_DRV_XGENE=y
 CONFIG_DMADEVICES=y
 CONFIG_PL330_DMA=y
+CONFIG_DMA_BCM2835=y
 CONFIG_TEGRA20_APB_DMA=y
 CONFIG_QCOM_BAM_DMA=y
 CONFIG_RCAR_DMAC=y
@@ -289,7 +304,9 @@  CONFIG_HWSPINLOCK_QCOM=y
 CONFIG_MAILBOX=y
 CONFIG_ARM_MHU=y
 CONFIG_HI6220_MBOX=y
+CONFIG_BCM2835_MBOX=y
 CONFIG_ARM_SMMU=y
+CONFIG_RASPBERRYPI_POWER=y
 CONFIG_QCOM_SMEM=y
 CONFIG_QCOM_SMD=y
 CONFIG_QCOM_SMD_RPM=y
@@ -302,6 +319,7 @@  CONFIG_PHY_HI6220_USB=y
 CONFIG_PHY_XGENE=y
 CONFIG_ARM_SCPI_PROTOCOL=y
 CONFIG_ACPI=y
+CONFIG_RASPBERRYPI_FIRMWARE=y
 CONFIG_EXT2_FS=y
 CONFIG_EXT3_FS=y
 CONFIG_FANOTIFY=y
@@ -311,7 +329,6 @@  CONFIG_AUTOFS4_FS=y
 CONFIG_FUSE_FS=y
 CONFIG_CUSE=y
 CONFIG_VFAT_FS=y
-CONFIG_TMPFS=y
 CONFIG_HUGETLBFS=y
 CONFIG_CONFIGFS_FS=y
 CONFIG_EFIVAR_FS=y