<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Apr 27, 2017 at 12:33 AM, Joel Stanley <span dir="ltr"><<a href="mailto:joel@jms.id.au" target="_blank">joel@jms.id.au</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><span class="">On Thu, Apr 27, 2017 at 3:00 AM, Rick Altherr <<a href="mailto:raltherr@google.com">raltherr@google.com</a>> wrote:<br>
> I saw Joel started <a href="https://gerrit.openbmc-project.xyz/#/c/2846/" rel="noreferrer" target="_blank">https://gerrit.openbmc-<wbr>project.xyz/#/c/2846/</a> which has a<br>
> defconfig for ast2400. If you have one for ast2500, please upload a new<br>
> patch set to that change.<br>
<br>
</span>I have defconfigs in the tree that are ready to go. I will upload them<br>
to Gerrit when I get the chance.<br>
<br></blockquote><div><br></div><div>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?</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
I've pulled in:<br>
<br>
- Ben's ftgmac100 patches from the net-next tree<br>
- Brendan's i2c patches, v7<br>
- Andrew's GPIO and Pinconf patches from the gpio and pinconf trees<br>
- Chris Bostic's FSI series, v6<br>
<br>
These are going through a test cycle on the ast2500evb and Plametto<br>
tonight. Once I have an ack for the i2c device tree, I will add that<br>
to the tree and push to github.<br>
<br>
Eddie, can you let me know which version of your OCC hwmon patches you<br>
want included. Same goes for the CFAM I2C patches. If you want to wait<br>
for review then please ping your reviewers and we can see if we can<br>
get the patches reviewed before we include them.<br>
<br>
Brad, can you point me to the SBE FIFO work that you want included. If<br>
you would prefer to wait for review that is okay.<br>
<br>
Matt, I think do you want to merge the MAX31785 hwmon driver as-is for now?<br>
<br>
Cheers,<br>
<br>
JOel<br>
<div class="HOEnZb"><div class="h5"><br>
><br>
> On Tue, Apr 25, 2017 at 5:30 PM, Xo Wang <<a href="mailto:xow@google.com">xow@google.com</a>> wrote:<br>
>><br>
>> On Tue, Apr 25, 2017 at 4:57 PM, Xo Wang <<a href="mailto:xow@google.com">xow@google.com</a>> wrote:<br>
>> > Hi Joel,<br>
>> ><br>
>> > On Thu, Apr 20, 2017 at 7:30 PM, Joel Stanley <<a href="mailto:joel@jms.id.au">joel@jms.id.au</a>> wrote:<br>
>> >> Hello team,<br>
>> >><br>
>> >> I want to make the 4.10 change happen. We don't have the resource to<br>
>> >> be maintaining two trees, and the 4.10 tree has a whole heap of<br>
>> >> shinyness - faster network, faster flash access, improved I2C.<br>
>> >><br>
>> >> To this end I will stop merging patches in to 4.7. Please target the<br>
>> >> 4.10 tree from here on.<br>
>> >><br>
>> >> Use this thread to discuss concerns and coordinate the work that needs<br>
>> >> to be done. Bits that I'm aware of<br>
>> >><br>
>> >> - Eddie is updating userspace to the new FSI APIs<br>
>> >> - I need to merge the upstream FSI patchset<br>
>> >> - Brednan needs to post the lastest version of the i2c patchset which<br>
>> >> I will merge<br>
>> >> - I need to merge benh's ftgmac100 improvements<br>
>> ><br>
>> > We'll need to update the defconfig in the build system. Currently if I<br>
>> > compile the kernel and generate a new defconfig (make savedefconfig),<br>
>> > I see the following changes in the 4.10 generated defconfig:<br>
>> ><br>
>> > @@ -73,7 +73,6 @@<br>
>> > CONFIG_MTD_BLOCK=y<br>
>> > CONFIG_MTD_PARTITIONED_MASTER=<wbr>y<br>
>> > CONFIG_MTD_SPI_NOR=y<br>
>> > -CONFIG_ASPEED_FLASH_SPI=y<br>
>> > CONFIG_MTD_UBI=y<br>
>> > CONFIG_MTD_UBI_FASTMAP=y<br>
>> > CONFIG_MTD_UBI_BLOCK=y<br>
>> > @@ -116,7 +115,6 @@<br>
>> > # CONFIG_SERIO is not set<br>
>> > # CONFIG_VT is not set<br>
>> > CONFIG_LEGACY_PTY_COUNT=4<br>
>> > -# CONFIG_DEVKMEM is not set<br>
>> > CONFIG_SERIAL_8250=y<br>
>> > # CONFIG_SERIAL_8250_DEPRECATED_<wbr>OPTIONS is not set<br>
>> > CONFIG_SERIAL_8250_CONSOLE=y<br>
>> > @@ -131,10 +129,8 @@<br>
>> > CONFIG_I2C=y<br>
>> > CONFIG_I2C_CHARDEV=y<br>
>> > CONFIG_I2C_ASPEED=y<br>
>> > -CONFIG_SENSORS_MAX31785=y<br>
>> > CONFIG_SENSORS_LM75=y<br>
>> > CONFIG_SENSORS_NCT7904=y<br>
>> > -CONFIG_SENSORS_POWER8_OCC_<wbr>I2C=y<br>
>> > CONFIG_PMBUS=y<br>
>> > CONFIG_SENSORS_ADM1275=y<br>
>> > CONFIG_SENSORS_UCD9000=y<br>
>> > @@ -143,21 +139,14 @@<br>
>> > # CONFIG_USB_SUPPORT is not set<br>
>> > CONFIG_NEW_LEDS=y<br>
>> > CONFIG_LEDS_CLASS=y<br>
>> > -CONFIG_LEDS_GPIO=y<br>
>> > CONFIG_LEDS_TRIGGERS=y<br>
>> > CONFIG_LEDS_TRIGGER_TIMER=y<br>
>> > CONFIG_LEDS_TRIGGER_HEARTBEAT=<wbr>y<br>
>> > -CONFIG_LEDS_TRIGGER_GPIO=y<br>
>> > CONFIG_RTC_CLASS=y<br>
>> > CONFIG_RTC_DRV_DS1307=y<br>
>> > CONFIG_RTC_DRV_ASPEED=y<br>
>> > CONFIG_MAILBOX=y<br>
>> > -CONFIG_ASPEED_MBOX=y<br>
>> > # CONFIG_IOMMU_SUPPORT is not set<br>
>> > -CONFIG_FSI=y<br>
>> > -CONFIG_FSI_MASTER_GPIO=y<br>
>> > -CONFIG_FSI_SCOM=y<br>
>> > -CONFIG_FSI_I2C=y<br>
>> > CONFIG_FIRMWARE_MEMMAP=y<br>
>> > CONFIG_FANOTIFY=y<br>
>> > CONFIG_AUTOFS4_FS=y<br>
>> ><br>
>> >><br>
>> >> Cheers,<br>
>> >><br>
>> >> Joel<br>
>> ><br>
>> > I know that CONFIG_ASPEED_FLASH_SPI is now CONFIG_SPI_ASPEED_SMC, but<br>
>> > I've yet to look at each of the other differences.<br>
>> ><br>
>> > cheers<br>
>> > xo<br>
>><br>
>> OK, I guess it's not that much work to look at those configs. This<br>
>> seems to work up to the limit of the missing FSI drivers as previously<br>
>> mentioned:<br>
>><br>
>> ---<br>
>> a/meta-openbmc-bsp/meta-<wbr>aspeed/meta-ast2500/recipes-<wbr>kernel/linux/linux-obmc/<wbr>defconfig<br>
>> +++<br>
>> b/meta-openbmc-bsp/meta-<wbr>aspeed/meta-ast2500/recipes-<wbr>kernel/linux/linux-obmc/<wbr>defconfig<br>
>> @@ -73,7 +73,7 @@ CONFIG_MTD_CMDLINE_PARTS=y<br>
>> CONFIG_MTD_BLOCK=y<br>
>> CONFIG_MTD_PARTITIONED_MASTER=<wbr>y<br>
>> CONFIG_MTD_SPI_NOR=y<br>
>> -CONFIG_ASPEED_FLASH_SPI=y<br>
>> +CONFIG_SPI_ASPEED_SMC=y<br>
>> CONFIG_MTD_UBI=y<br>
>> CONFIG_MTD_UBI_FASTMAP=y<br>
>> CONFIG_MTD_UBI_BLOCK=y<br>
>> @@ -116,7 +116,6 @@ CONFIG_INPUT_EVDEV=y<br>
>> # CONFIG_SERIO is not set<br>
>> # CONFIG_VT is not set<br>
>> CONFIG_LEGACY_PTY_COUNT=4<br>
>> -# CONFIG_DEVKMEM is not set<br>
>> CONFIG_SERIAL_8250=y<br>
>> # CONFIG_SERIAL_8250_DEPRECATED_<wbr>OPTIONS is not set<br>
>> CONFIG_SERIAL_8250_CONSOLE=y<br>
>> @@ -131,10 +130,11 @@ CONFIG_ASPEED_BT_IPMI_BMC=y<br>
>> CONFIG_I2C=y<br>
>> CONFIG_I2C_CHARDEV=y<br>
>> CONFIG_I2C_ASPEED=y<br>
>> -CONFIG_SENSORS_MAX31785=y<br>
>> +CONFIG_GPIOLIB=y<br>
>> +CONFIG_GPIO_SYSFS=y<br>
>> +CONFIG_GPIO_ASPEED=y<br>
>> CONFIG_SENSORS_LM75=y<br>
>> CONFIG_SENSORS_NCT7904=y<br>
>> -CONFIG_SENSORS_POWER8_OCC_<wbr>I2C=y<br>
>> CONFIG_PMBUS=y<br>
>> CONFIG_SENSORS_ADM1275=y<br>
>> CONFIG_SENSORS_UCD9000=y<br>
>> @@ -152,12 +152,8 @@ CONFIG_RTC_CLASS=y<br>
>> CONFIG_RTC_DRV_DS1307=y<br>
>> CONFIG_RTC_DRV_ASPEED=y<br>
>> CONFIG_MAILBOX=y<br>
>> -CONFIG_ASPEED_MBOX=y<br>
>> +CONFIG_ASPEED_LPC_MBOX=y<br>
>> # CONFIG_IOMMU_SUPPORT is not set<br>
>> -CONFIG_FSI=y<br>
>> -CONFIG_FSI_MASTER_GPIO=y<br>
>> -CONFIG_FSI_SCOM=y<br>
>> -CONFIG_FSI_I2C=y<br>
>> CONFIG_FIRMWARE_MEMMAP=y<br>
>> CONFIG_FANOTIFY=y<br>
>> CONFIG_AUTOFS4_FS=y<br>
>><br>
>> cheers<br>
>> xo<br>
><br>
><br>
</div></div></blockquote></div><br></div></div>