diff options
| author | Ed Tanous <ed.tanous@intel.com> | 2019-06-20 19:46:38 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-20 19:46:38 +0300 |
| commit | 43a183cc0926da36e3a218efa02ab4838ace316f (patch) | |
| tree | 9ea192b408585fc2a19b54d196c3d56eaddc4acb /meta-aspeed | |
| parent | 5575b1d27fc222f973d96dc06af0f21ba7656f28 (diff) | |
| parent | 2c7e8f4ce61f2e0407c37e98e22bbb13e562b414 (diff) | |
| download | openbmc-43a183cc0926da36e3a218efa02ab4838ace316f.tar.xz | |
Merge pull request #12 from Intel-BMC/update
Update
Diffstat (limited to 'meta-aspeed')
3 files changed, 5 insertions, 3 deletions
diff --git a/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed_2016.07.inc b/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed_2016.07.inc index 261c1a425..7e400b7ad 100644 --- a/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed_2016.07.inc +++ b/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed_2016.07.inc @@ -8,7 +8,7 @@ PE = "1" # We use the revision in order to avoid having to fetch it from the # repo during parse -SRCREV = "cc6c5bef00ebbac0b37f9a406913ca17ff9c56b5" +SRCREV = "59428fe010c4c95261e88b737a847643f2682a6b" UBRANCH = "v2016.07-aspeed-openbmc" SRC_URI = "git://git@github.com/openbmc/u-boot.git;branch=${UBRANCH};protocol=https" diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g5/defconfig b/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g5/defconfig index 1452eec6c..adb9c0766 100755 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g5/defconfig +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g5/defconfig @@ -160,6 +160,8 @@ CONFIG_I2C_FSI=y CONFIG_GPIOLIB=y CONFIG_GPIO_SYSFS=y CONFIG_GPIO_ASPEED=y +CONFIG_GPIO_PCA953X=y +CONFIG_GPIO_PCA953X_IRQ=y CONFIG_W1=y CONFIG_W1_MASTER_GPIO=y CONFIG_W1_SLAVE_THERM=y diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb index e432eed9e..0086dee73 100644 --- a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb +++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb @@ -1,6 +1,6 @@ KBRANCH ?= "dev-5.1" -LINUX_VERSION ?= "5.1.5" +LINUX_VERSION ?= "5.1.9" -SRCREV="42a312b1b9fe4c0acfe812e7e5d6ff43cf81bb0f" +SRCREV="fa272957f698f24b90db374fe31a977f1a286c24" require linux-aspeed.inc |