Switching to 4.10

Xo Wang xow at google.com
Wed Apr 26 09:57:39 AEST 2017


Hi Joel,

On Thu, Apr 20, 2017 at 7:30 PM, Joel Stanley <joel at jms.id.au> wrote:
> Hello team,
>
> I want to make the 4.10 change happen. We don't have the resource to
> be maintaining two trees, and the 4.10 tree has a whole heap of
> shinyness - faster network, faster flash access, improved I2C.
>
> To this end I will stop merging patches in to 4.7. Please target the
> 4.10 tree from here on.
>
> Use this thread to discuss concerns and coordinate the work that needs
> to be done. Bits that I'm aware of
>
>  - Eddie is updating userspace to the new FSI APIs
>  - I need to merge the upstream FSI patchset
>  - Brednan needs to post the lastest version of the i2c patchset which
> I will merge
>  - I need to merge benh's ftgmac100 improvements

We'll need to update the defconfig in the build system. Currently if I
compile the kernel and generate a new defconfig (make savedefconfig),
I see the following changes in the 4.10 generated defconfig:

@@ -73,7 +73,6 @@
 CONFIG_MTD_BLOCK=y
 CONFIG_MTD_PARTITIONED_MASTER=y
 CONFIG_MTD_SPI_NOR=y
-CONFIG_ASPEED_FLASH_SPI=y
 CONFIG_MTD_UBI=y
 CONFIG_MTD_UBI_FASTMAP=y
 CONFIG_MTD_UBI_BLOCK=y
@@ -116,7 +115,6 @@
 # CONFIG_SERIO is not set
 # CONFIG_VT is not set
 CONFIG_LEGACY_PTY_COUNT=4
-# CONFIG_DEVKMEM is not set
 CONFIG_SERIAL_8250=y
 # CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
 CONFIG_SERIAL_8250_CONSOLE=y
@@ -131,10 +129,8 @@
 CONFIG_I2C=y
 CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_ASPEED=y
-CONFIG_SENSORS_MAX31785=y
 CONFIG_SENSORS_LM75=y
 CONFIG_SENSORS_NCT7904=y
-CONFIG_SENSORS_POWER8_OCC_I2C=y
 CONFIG_PMBUS=y
 CONFIG_SENSORS_ADM1275=y
 CONFIG_SENSORS_UCD9000=y
@@ -143,21 +139,14 @@
 # CONFIG_USB_SUPPORT is not set
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_GPIO=y
 CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_TIMER=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-CONFIG_LEDS_TRIGGER_GPIO=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_DS1307=y
 CONFIG_RTC_DRV_ASPEED=y
 CONFIG_MAILBOX=y
-CONFIG_ASPEED_MBOX=y
 # CONFIG_IOMMU_SUPPORT is not set
-CONFIG_FSI=y
-CONFIG_FSI_MASTER_GPIO=y
-CONFIG_FSI_SCOM=y
-CONFIG_FSI_I2C=y
 CONFIG_FIRMWARE_MEMMAP=y
 CONFIG_FANOTIFY=y
 CONFIG_AUTOFS4_FS=y

>
> Cheers,
>
> Joel

I know that CONFIG_ASPEED_FLASH_SPI is now CONFIG_SPI_ASPEED_SMC, but
I've yet to look at each of the other differences.

cheers
xo


More information about the openbmc mailing list