Switching to 4.10

Fri Apr 28 04:14:44 AEST 2017

On Thu, Apr 27, 2017 at 12:33 AM, Joel Stanley <joel at jms.id.au> wrote:

> On Thu, Apr 27, 2017 at 3:00 AM, Rick Altherr <raltherr at google.com> wrote:
> > I saw Joel started https://gerrit.openbmc-project.xyz/#/c/2846/ which
> has a
> > defconfig for ast2400.  If you have one for ast2500, please upload a new
> > patch set to that change.
>
> I have defconfigs in the tree that are ready to go. I will upload them
> to Gerrit when I get the chance.
>
>
I've been holding off on testing some RNG changes because it depends on
4.10.  Can you please upload these defconfigs so I can build a full 4.10
image more easily?

> I've pulled in:
>
>  - Ben's ftgmac100 patches from the net-next tree
>  - Brendan's i2c patches, v7
>  - Andrew's GPIO and Pinconf patches from the gpio and pinconf trees
>  - Chris Bostic's FSI series, v6
>
> These are going through a test cycle on the ast2500evb and Plametto
> tonight. Once I have an ack for the i2c device tree, I will add that
> to the tree and push to github.
>
> Eddie, can you let me know which version of your OCC hwmon patches you
> want included. Same goes for the CFAM I2C patches. If you want to wait
> for review then please ping your reviewers and we can see if we can
> get the patches reviewed before we include them.
>
> Brad, can you point me to the SBE FIFO work that you want included. If
> you would prefer to wait for review that is okay.
>
> Matt, I think do you want to merge the MAX31785 hwmon driver as-is for now?
>
> Cheers,
>
> JOel
>
> >
> > On Tue, Apr 25, 2017 at 5:30 PM, Xo Wang <xow at google.com> wrote:
> >>
> >> On Tue, Apr 25, 2017 at 4:57 PM, Xo Wang <xow at google.com> wrote:
> >> > 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
> >>
> >> OK, I guess it's not that much work to look at those configs. This
> >> seems to work up to the limit of the missing FSI drivers as previously
> >> mentioned:
> >>
> >> ---
> >> a/meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-
> kernel/linux/linux-obmc/defconfig
> >> +++
> >> b/meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-
> kernel/linux/linux-obmc/defconfig
> >> @@ -73,7 +73,7 @@ CONFIG_MTD_CMDLINE_PARTS=y
> >>  CONFIG_MTD_BLOCK=y
> >>  CONFIG_MTD_PARTITIONED_MASTER=y
> >>  CONFIG_MTD_SPI_NOR=y
> >> -CONFIG_ASPEED_FLASH_SPI=y
> >> +CONFIG_SPI_ASPEED_SMC=y
> >>  CONFIG_MTD_UBI=y
> >>  CONFIG_MTD_UBI_FASTMAP=y
> >>  CONFIG_MTD_UBI_BLOCK=y
> >> @@ -116,7 +116,6 @@ CONFIG_INPUT_EVDEV=y
> >>  # 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 +130,11 @@ CONFIG_ASPEED_BT_IPMI_BMC=y
> >>  CONFIG_I2C=y
> >>  CONFIG_I2C_CHARDEV=y
> >>  CONFIG_I2C_ASPEED=y
> >> -CONFIG_SENSORS_MAX31785=y
> >> +CONFIG_GPIOLIB=y
> >> +CONFIG_GPIO_SYSFS=y
> >> +CONFIG_GPIO_ASPEED=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
> >> @@ -152,12 +152,8 @@ CONFIG_RTC_CLASS=y
> >>  CONFIG_RTC_DRV_DS1307=y
> >>  CONFIG_RTC_DRV_ASPEED=y
> >>  CONFIG_MAILBOX=y
> >> -CONFIG_ASPEED_MBOX=y
> >> +CONFIG_ASPEED_LPC_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
> >> xo
> >
> >
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ozlabs.org/pipermail/openbmc/attachments/20170427/9734381f/attachment-0001.html>