Merge branch 'intel' into intel2

16 files changed, 205 insertions, 147 deletions

diff --git a/meta-aspeed/conf/layer.conf b/meta-aspeed/conf/layer.conf
index 8c0d502cf..9741d26b2 100644
--- a/meta-aspeed/conf/layer.conf
+++ b/meta-aspeed/conf/layer.conf
@@ -7,6 +7,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 BBFILE_COLLECTIONS += "aspeed-layer"
 BBFILE_PATTERN_aspeed-layer := "^${LAYERDIR}/"
 LAYERVERSION_aspeed-layer = "1"
-LAYERSERIES_COMPAT_aspeed-layer = "warrior"
-
-ASPEEDBASE = '${@os.path.normpath("${LAYERDIR}/")}'
+LAYERSERIES_COMPAT_aspeed-layer = "warrior zeus"
diff --git a/meta-aspeed/conf/machine/evb-ast2500.conf b/meta-aspeed/conf/machine/evb-ast2500.conf
index 2689d3796..e8aebd18f 100644
--- a/meta-aspeed/conf/machine/evb-ast2500.conf
+++ b/meta-aspeed/conf/machine/evb-ast2500.conf
@@ -2,3 +2,5 @@ KERNEL_DEVICETREE = "aspeed-ast2500-evb.dtb"
 UBOOT_MACHINE = "ast_g5_phy_config"
 
 require conf/machine/include/ast2500.inc
+
+SERIAL_CONSOLES = "115200;ttyS4"
diff --git a/meta-aspeed/conf/machine/evb-ast2600.conf b/meta-aspeed/conf/machine/evb-ast2600.conf
index fd72baa17..9c8c64963 100644
--- a/meta-aspeed/conf/machine/evb-ast2600.conf
+++ b/meta-aspeed/conf/machine/evb-ast2600.conf
@@ -2,3 +2,5 @@ KERNEL_DEVICETREE = "aspeed-ast2600-evb.dtb"
 UBOOT_MACHINE = "evb-ast2600_defconfig"
 
 require conf/machine/include/ast2600.inc
+
+SERIAL_CONSOLES = "115200;ttyS4"
diff --git a/meta-aspeed/conf/machine/include/aspeed.inc b/meta-aspeed/conf/machine/include/aspeed.inc
index e62af13b8..946eebccd 100644
--- a/meta-aspeed/conf/machine/include/aspeed.inc
+++ b/meta-aspeed/conf/machine/include/aspeed.inc
@@ -3,9 +3,28 @@ PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-aspeed"
 PREFERRED_PROVIDER_u-boot ?= "u-boot-aspeed"
 PREFERRED_PROVIDER_u-boot-fw-utils ?= "u-boot-fw-utils-aspeed"
 
-PREFERRED_PROVIDER_virtual/kernel_aspeed-g6 ?= "linux-aspeed-sdk"
 PREFERRED_PROVIDER_virtual/bootloader_aspeed-g6 ?= "u-boot-aspeed-sdk"
 PREFERRED_PROVIDER_u-boot_aspeed-g6 ?= "u-boot-aspeed-sdk"
 PREFERRED_PROVIDER_u-boot-fw-utils_aspeed-g6 ?= "u-boot-fw-utils-aspeed-sdk"
 
+# Build a FIT image and stuff core-image-minimal in it by default.
+KERNEL_IMAGETYPE ?= "fitImage"
+KERNEL_CLASSES ?= "kernel-fitimage"
+INITRAMFS_IMAGE ?= "aspeed-image-initramfs"
+INITRAMFS_FSTYPES ?= "cpio.xz"
+
+MACHINE_EXTRA_RRECOMMENDS += "udev-aspeed-vuart"
+
 MACHINEOVERRIDES =. "aspeed:"
+
+SERIAL_CONSOLES ?= "115200;ttyS4"
+
+DEFAULTTUNE_aspeed-g5 ?= "arm1176jzs"
+DEFAULTTUNE_aspeed-g6 ?= "armv7a-vfpv4d16"
+
+UBOOT_ENTRYPOINT_aspeed-g4 ?= "0x40001000"
+UBOOT_ENTRYPOINT_aspeed-g5 ?= "0x80001000"
+UBOOT_ENTRYPOINT_aspeed-g6 ?= "0x80001000"
+UBOOT_LOADADDRESS_aspeed-g4 ?= "0x40001000"
+UBOOT_LOADADDRESS_aspeed-g5 ?= "0x80001000"
+UBOOT_LOADADDRESS_aspeed-g6 ?= "0x80001000"
diff --git a/meta-aspeed/conf/machine/include/ast2400.inc b/meta-aspeed/conf/machine/include/ast2400.inc
index a7c900aa7..6284a2b64 100644
--- a/meta-aspeed/conf/machine/include/ast2400.inc
+++ b/meta-aspeed/conf/machine/include/ast2400.inc
@@ -1,16 +1,4 @@
-#@TYPE: Machine
-#@NAME: Aspeed AST2400
-#@DESCRIPTION: Common machine configuration for the Aspeed AST2400 Chip
-
 SOC_FAMILY = "aspeed-g4"
 include conf/machine/include/soc-family.inc
 require conf/machine/include/aspeed.inc
 require conf/machine/include/tune-arm926ejs.inc
-
-UBOOT_MACHINE ?= "ast_g4_ncsi_config"
-UBOOT_ENTRYPOINT ?= "0x40001000"
-UBOOT_LOADADDRESS ?= "0x40001000"
-
-MACHINE_EXTRA_RDEPENDS += "udev-aspeed-vuart"
-
-SERIAL_CONSOLES = "115200;ttyS4"
diff --git a/meta-aspeed/conf/machine/include/ast2500.inc b/meta-aspeed/conf/machine/include/ast2500.inc
index 49a62110a..0724157a9 100644
--- a/meta-aspeed/conf/machine/include/ast2500.inc
+++ b/meta-aspeed/conf/machine/include/ast2500.inc
@@ -1,18 +1,4 @@
-#@TYPE: Machine
-#@NAME: Aspeed AST2500
-#@DESCRIPTION: Common machine configuration for the Aspeed AST2500 Chip
-
 SOC_FAMILY = "aspeed-g5"
 include conf/machine/include/soc-family.inc
 require conf/machine/include/aspeed.inc
-
-DEFAULTTUNE ?= "arm1176jzs"
 require conf/machine/include/tune-arm1176jz-s.inc
-
-UBOOT_MACHINE ?= "ast_g5_ncsi_config"
-UBOOT_ENTRYPOINT ?= "0x80001000"
-UBOOT_LOADADDRESS ?= "0x80001000"
-
-MACHINE_EXTRA_RDEPENDS += "udev-aspeed-vuart"
-
-SERIAL_CONSOLES = "115200;ttyS4"
diff --git a/meta-aspeed/conf/machine/include/ast2600.inc b/meta-aspeed/conf/machine/include/ast2600.inc
index 2dcaaf613..fff5465d9 100644
--- a/meta-aspeed/conf/machine/include/ast2600.inc
+++ b/meta-aspeed/conf/machine/include/ast2600.inc
@@ -1,7 +1,4 @@
 SOC_FAMILY = "aspeed-g6"
 include conf/machine/include/soc-family.inc
 require conf/machine/include/aspeed.inc
-require conf/machine/include/tune-cortexa7.inc
-
-UBOOT_ENTRYPOINT = "0x80001000"
-UBOOT_LOADADDRESS = "0x80001000"
+include conf/machine/include/arm/arch-armv7a.inc
diff --git a/meta-aspeed/conf/machine/include/tune-arm1176jz-s.inc b/meta-aspeed/conf/machine/include/tune-arm1176jz-s.inc
deleted file mode 100644
index 5216533eb..000000000
--- a/meta-aspeed/conf/machine/include/tune-arm1176jz-s.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFAULTTUNE ?= "armv6t-novfp"
-
-require conf/machine/include/arm/arch-armv6.inc
-
-TUNEVALID[arm1176jzs] = "Enable arm1176jzs specific processor optimizations"
-TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "arm1176jzs", "-mtune=arm1176jz-s", "", d)}"
-
-AVAILTUNES += "arm1176jzs"
-ARMPKGARCH_tune-arm1176jzs = "${ARMPKGARCH_tune-armv6t-novfp}"
-TUNE_FEATURES_tune-arm1176jzs = "${TUNE_FEATURES_tune-armv6t-novfp} arm1176jzs"
-PACKAGE_EXTRA_ARCHS_tune-arm1176jzs = "${PACKAGE_EXTRA_ARCHS_tune-armv6t-novfp}"
diff --git a/meta-aspeed/recipes-aspeed/images/aspeed-image-initramfs.bb b/meta-aspeed/recipes-aspeed/images/aspeed-image-initramfs.bb
new file mode 100644
index 000000000..9f4502103
--- /dev/null
+++ b/meta-aspeed/recipes-aspeed/images/aspeed-image-initramfs.bb
@@ -0,0 +1,3 @@
+IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}"
+
+require recipes-core/images/core-image-minimal.bb
diff --git a/meta-aspeed/recipes-aspeed/images/aspeed-image-norootfs.bb b/meta-aspeed/recipes-aspeed/images/aspeed-image-norootfs.bb
new file mode 100644
index 000000000..54c095bed
--- /dev/null
+++ b/meta-aspeed/recipes-aspeed/images/aspeed-image-norootfs.bb
@@ -0,0 +1,40 @@
+SUMMARY = "Two partition MTD image with u-boot and kernel"
+HOMEPAGE = "https://github.com/openbmc/meta-aspeed"
+LICENSE = "MIT"
+
+inherit deploy
+
+UBOOT_SUFFIX ?= "bin"
+ASPEED_IMAGE_KERNEL_OFFSET_KB ?= "512"
+ASPEED_IMAGE_SIZE_KB ?= "32768"
+ASPEED_IMAGE_KERNEL_IMAGE ?= "fitImage-${INITRAMFS_IMAGE}-${MACHINE}-${MACHINE}"
+ASPEED_IMAGE_NAME ?= "aspeed-norootfs-${MACHINE}.bin"
+
+do_compile() {
+    dd if=/dev/zero bs=1k count=${ASPEED_IMAGE_SIZE_KB} | \
+        tr '\000' '\377' > ${B}/aspeed-norootfs.bin
+    dd if=${DEPLOY_DIR_IMAGE}/u-boot.${UBOOT_SUFFIX} of=${B}/aspeed-norootfs.bin \
+        conv=notrunc
+    dd if=${DEPLOY_DIR_IMAGE}/${ASPEED_IMAGE_KERNEL_IMAGE} \
+        of=${B}/aspeed-norootfs.bin conv=notrunc \
+        seek=${ASPEED_IMAGE_KERNEL_OFFSET_KB} bs=1k
+}
+
+do_deploy() {
+    install -m644 -D ${B}/aspeed-norootfs.bin ${DEPLOYDIR}/${ASPEED_IMAGE_NAME}
+}
+
+do_compile[depends] = "virtual/kernel:do_deploy u-boot:do_deploy"
+do_fetch[noexec] = "1"
+do_unpack[noexec] = "1"
+do_patch[noexec] = "1"
+do_configure[noexec] = "1"
+do_install[noexec] = "1"
+deltask do_populate_sysroot
+do_package[noexec] = "1"
+deltask do_package_qa
+do_packagedata[noexec] = "1"
+deltask do_package_write_ipk
+deltask do_package_write_deb
+deltask do_package_write_rpm
+addtask deploy before do_build after do_compile
diff --git a/meta-aspeed/recipes-bsp/u-boot/files/0001-arm-evb-ast2600-put-environment-back-at-512KiB.patch b/meta-aspeed/recipes-bsp/u-boot/files/0001-arm-evb-ast2600-put-environment-back-at-512KiB.patch
new file mode 100644
index 000000000..e010f26c1
--- /dev/null
+++ b/meta-aspeed/recipes-bsp/u-boot/files/0001-arm-evb-ast2600-put-environment-back-at-512KiB.patch
@@ -0,0 +1,47 @@
+From 2add5b8d1216be2e446a3d707767c2a5ec6be9f4 Mon Sep 17 00:00:00 2001
+From: Brad Bishop <bradleyb@fuzziesquirrel.com>
+Date: Thu, 5 Sep 2019 20:39:57 -0400
+Subject: [PATCH u-boot aspeed-dev-v2019.04] arm: evb-ast2600: put environment
+ back at 512KiB
+
+Prior to 473f430b90 the environment was at 512KiB, and compatible with
+OpenBMC.  Restore OpenBMC compatibility by moving the environment back
+to 512KiB.
+
+Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
+---
+ include/configs/aspeed-common.h | 4 +++-
+ include/configs/evb_ast2600.h   | 2 +-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/include/configs/aspeed-common.h b/include/configs/aspeed-common.h
+index 7a730d17ad..d1eb4688e6 100644
+--- a/include/configs/aspeed-common.h
++++ b/include/configs/aspeed-common.h
+@@ -52,7 +52,9 @@
+ /*
+  * Miscellaneous configurable options
+  */
+-#define CONFIG_BOOTCOMMAND		"bootm 200a0000"
++#ifndef CONFIG_BOOTCOMMAND
++#define CONFIG_BOOTCOMMAND		"bootm 20080000"
++#endif
+ #define CONFIG_ENV_OVERWRITE
+ 
+ #define CONFIG_SYS_BOOTM_LEN 		(0x800000 * 2)
+diff --git a/include/configs/evb_ast2600.h b/include/configs/evb_ast2600.h
+index b4de42a05a..3a12f2f0d4 100644
+--- a/include/configs/evb_ast2600.h
++++ b/include/configs/evb_ast2600.h
+@@ -18,7 +18,7 @@
+ 
+ /* Environment */
+ #define CONFIG_ENV_SIZE			0x10000
+-#define CONFIG_ENV_OFFSET		0x90000
++#define CONFIG_ENV_OFFSET		0x60000
+ #define CONFIG_ENV_SECT_SIZE		(4 << 10)
+ 
+ #endif	/* __CONFIG_H */
+-- 
+2.21.0
+
diff --git a/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed-sdk/flash-131072/bootcmd.cfg b/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed-sdk/flash-131072/bootcmd.cfg
new file mode 100644
index 000000000..6862aaeb7
--- /dev/null
+++ b/meta-aspeed/recipes-bsp/u-boot/u-boot-aspeed-sdk/flash-131072/bootcmd.cfg
@@ -0,0 +1,2 @@
+CONFIG_USE_BOOTCOMMAND=y
+CONFIG_BOOTCOMMAND="bootm 20100000"
diff --git a/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc b/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc
index 7aa879cdf..31dc5f2c8 100644
--- a/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc
+++ b/meta-aspeed/recipes-bsp/u-boot/u-boot-common-aspeed-sdk_2019.04.inc
@@ -8,11 +8,16 @@ PE = "1"
 
 # We use the revision in order to avoid having to fetch it from the
 # repo during parse
-SRCREV = "d8ebf49e584e4e134bd8d1c445ef2da276a00e1a"
+SRCREV = "4d29b04c7aca4121d542b759575fbb93e52aef47"
 
-UBRANCH = "aspeed-master-v2019.04"
+UBRANCH = "aspeed-dev-v2019.04"
 SRC_URI = "git://github.com/AspeedTech-BMC/u-boot;branch=${UBRANCH};protocol=https"
-SRC_URI += "file://0001-aspeed-Limit-bootm-memory.patch"
+SRC_URI += "file://0001-arm-evb-ast2600-put-environment-back-at-512KiB.patch"
+
+# There are different BOOTCOMMANDS for differently sized raw flash modules.
+ASPEED_IMAGE_SIZE_KB ?= "32768"
+MACHINEOVERRIDES .= ":flash-${ASPEED_IMAGE_SIZE_KB}"
+SRC_URI_append_flash-131072 = " file://bootcmd.cfg"
 
 S = "${WORKDIR}/git"
 
diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed-sdk_git.bb b/meta-aspeed/recipes-kernel/linux/linux-aspeed-sdk_git.bb
deleted file mode 100644
index 1ca1ec547..000000000
--- a/meta-aspeed/recipes-kernel/linux/linux-aspeed-sdk_git.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-KBRANCH ?= "aspeed-master-v5.1"
-KSRC ?= "git://github.com/AspeedTech-BMC/linux;protocol=git;branch=${KBRANCH}"
-LINUX_VERSION ?= "5.1.3"
-
-SRCREV="466b2520fa3bbedad4da77d3eaad33d3f8838b7f"
-
-require linux-aspeed.inc
-
-# This must come after the require line
-SRC_URI += "file://0001-aspeed-espi-Clean-up-error-handling.patch"
diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed-sdk/aspeed-g6/defconfig b/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig
index 92f922cb6..43a77c1d2 100644
--- a/meta-aspeed/recipes-kernel/linux/linux-aspeed-sdk/aspeed-g6/defconfig
+++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed/aspeed-g6/defconfig
@@ -22,26 +22,28 @@ CONFIG_PERF_EVENTS=y
 # CONFIG_COMPAT_BRK is not set
 CONFIG_SLAB=y
 CONFIG_SLAB_FREELIST_RANDOM=y
+CONFIG_ARCH_MULTI_V6=y
 CONFIG_ARCH_ASPEED=y
 CONFIG_MACH_ASPEED_G6=y
 # CONFIG_CACHE_L2X0 is not set
 CONFIG_SMP=y
-CONFIG_HAVE_ARM_ARCH_TIMER=y
+# CONFIG_ARM_CPU_TOPOLOGY is not set
 CONFIG_VMSPLIT_2G=y
-CONFIG_HIGHMEM=y
 CONFIG_NR_CPUS=2
+CONFIG_HIGHMEM=y
 CONFIG_UACCESS_WITH_MEMCPY=y
 CONFIG_SECCOMP=y
 # CONFIG_ATAGS is not set
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_KEXEC=y
 CONFIG_VFP=y
+CONFIG_NEON=y
+CONFIG_KERNEL_MODE_NEON=y
 CONFIG_FIRMWARE_MEMMAP=y
 CONFIG_JUMP_LABEL=y
-CONFIG_MODULES=y
-CONFIG_MODULE_FORCE_LOAD=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODULE_FORCE_UNLOAD=y
+# CONFIG_BLK_DEV_BSG is not set
+# CONFIG_BLK_DEBUG_FS is not set
 # CONFIG_MQ_IOSCHED_DEADLINE is not set
 # CONFIG_MQ_IOSCHED_KYBER is not set
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
@@ -58,70 +60,34 @@ CONFIG_IP_MULTIPLE_TABLES=y
 CONFIG_IP_ROUTE_MULTIPATH=y
 CONFIG_IP_ROUTE_VERBOSE=y
 CONFIG_SYN_COOKIES=y
-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET_XFRM_MODE_BEET is not set
 # CONFIG_INET_DIAG is not set
 CONFIG_IPV6_ROUTER_PREF=y
 CONFIG_IPV6_ROUTE_INFO=y
 CONFIG_IPV6_OPTIMISTIC_DAD=y
-# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET6_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET6_XFRM_MODE_BEET is not set
 CONFIG_IPV6_MULTIPLE_TABLES=y
 CONFIG_NETFILTER=y
 # CONFIG_NETFILTER_ADVANCED is not set
-CONFIG_NF_CONNTRACK=y
-CONFIG_NF_CONNTRACK_FTP=y
-CONFIG_NF_CONNTRACK_IRC=y
-CONFIG_NF_CONNTRACK_SIP=y
-CONFIG_NF_CT_NETLINK=y
-CONFIG_NETFILTER_XT_MARK=y
-CONFIG_NETFILTER_XT_TARGET_LOG=y
-CONFIG_NETFILTER_XT_TARGET_NFLOG=y
-CONFIG_NETFILTER_XT_TARGET_TCPMSS=y
-CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=y
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y
-CONFIG_NETFILTER_XT_MATCH_STATE=y
-CONFIG_NF_LOG_ARP=y
-CONFIG_IP_NF_IPTABLES=y
-CONFIG_IP_NF_FILTER=y
-CONFIG_IP_NF_TARGET_REJECT=y
-CONFIG_IP_NF_NAT=y
-CONFIG_IP_NF_TARGET_MASQUERADE=y
-CONFIG_IP_NF_MANGLE=y
-CONFIG_IP6_NF_IPTABLES=y
-CONFIG_IP6_NF_MATCH_IPV6HEADER=y
-CONFIG_IP6_NF_FILTER=y
-CONFIG_IP6_NF_TARGET_REJECT=y
-CONFIG_IP6_NF_MANGLE=y
 CONFIG_VLAN_8021Q=y
 CONFIG_NET_NCSI=y
 # CONFIG_WIRELESS is not set
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_PREVENT_FIRMWARE_BUILD is not set
 CONFIG_MTD=y
 CONFIG_MTD_BLOCK=y
 CONFIG_MTD_PARTITIONED_MASTER=y
-CONFIG_MTD_DATAFLASH=y
-CONFIG_MTD_M25P80=y
-CONFIG_MTD_BLOCK2MTD=y
 CONFIG_MTD_SPI_NOR=y
 # CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set
+CONFIG_SPI_ASPEED_SMC=y
 CONFIG_MTD_UBI=y
 CONFIG_MTD_UBI_FASTMAP=y
 CONFIG_MTD_UBI_BLOCK=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_NBD=y
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_SIZE=16384
-CONFIG_ASPEED_LPC_SNOOP=y
-CONFIG_ASPEED_LPC_MBOX=y
 CONFIG_EEPROM_AT24=y
-CONFIG_SCSI=y
-CONFIG_BLK_DEV_SD=y
+CONFIG_MD=y
+CONFIG_BLK_DEV_DM=y
+CONFIG_DM_VERITY=y
 CONFIG_NETDEVICES=y
 CONFIG_NETCONSOLE=y
 # CONFIG_NET_VENDOR_ALACRITECH is not set
@@ -174,8 +140,8 @@ CONFIG_KEYBOARD_GPIO_POLLED=y
 CONFIG_SERIAL_8250=y
 # CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
 CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_NR_UARTS=17
-CONFIG_SERIAL_8250_RUNTIME_UARTS=17
+CONFIG_SERIAL_8250_NR_UARTS=6
+CONFIG_SERIAL_8250_RUNTIME_UARTS=6
 CONFIG_SERIAL_8250_EXTENDED=y
 CONFIG_SERIAL_8250_ASPEED_VUART=y
 CONFIG_SERIAL_8250_SHARE_IRQ=y
@@ -183,22 +149,47 @@ CONFIG_SERIAL_8250_DW=y
 CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_ASPEED_KCS_IPMI_BMC=y
 CONFIG_ASPEED_BT_IPMI_BMC=y
-CONFIG_HW_RANDOM=y
+CONFIG_HW_RANDOM_TIMERIOMEM=y
+# CONFIG_I2C_COMPAT is not set
 CONFIG_I2C_CHARDEV=y
-CONFIG_I2C_NEW_ASPEED=y
-CONFIG_I2C_SLAVE=y
-CONFIG_I2C_SLAVE_EEPROM=y
+CONFIG_I2C_MUX_PCA9541=y
+CONFIG_I2C_MUX_PCA954x=y
+CONFIG_I2C_ASPEED=y
+CONFIG_I2C_FSI=y
 CONFIG_SPI=y
-CONFIG_SPI_FMC=y
-CONFIG_DEBUG_PINCTRL=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_ASPEED=y
-CONFIG_SGPIO_ASPEED=y
-CONFIG_SENSORS_ASPEED_PWM_TECHOMETER=y
+CONFIG_GPIO_PCA953X=y
+CONFIG_GPIO_PCA953X_IRQ=y
+CONFIG_W1=y
+CONFIG_W1_MASTER_GPIO=y
+CONFIG_W1_SLAVE_THERM=y
+CONFIG_SENSORS_ASPEED=y
 CONFIG_SENSORS_IIO_HWMON=y
-CONFIG_THERMAL=y
+CONFIG_SENSORS_LM75=y
+CONFIG_SENSORS_NCT7904=y
+CONFIG_SENSORS_OCC_P8_I2C=y
+CONFIG_SENSORS_OCC_P9_SBE=y
+CONFIG_SENSORS_PECI_CPUTEMP=y
+CONFIG_SENSORS_PECI_DIMMTEMP=y
+CONFIG_PMBUS=y
+CONFIG_SENSORS_ADM1275=y
+CONFIG_SENSORS_IBM_CFFPS=y
+CONFIG_SENSORS_IR35221=y
+CONFIG_SENSORS_IR38064=y
+CONFIG_SENSORS_ISL68137=y
+CONFIG_SENSORS_LM25066=y
+CONFIG_SENSORS_MAX31785=y
+CONFIG_SENSORS_UCD9000=y
+CONFIG_SENSORS_UCD9200=y
+CONFIG_SENSORS_TMP421=y
+CONFIG_SENSORS_W83773G=y
 CONFIG_WATCHDOG_SYSFS=y
+CONFIG_MEDIA_SUPPORT=y
+CONFIG_MEDIA_CAMERA_SUPPORT=y
+CONFIG_V4L_PLATFORM_DRIVERS=y
+CONFIG_VIDEO_ASPEED=y
 CONFIG_DRM=y
 CONFIG_DRM_ASPEED_GFX=y
 CONFIG_USB=y
@@ -207,50 +198,53 @@ CONFIG_USB_DYNAMIC_MINORS=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_HCD_PLATFORM=y
-CONFIG_USB_UHCI_HCD=y
-CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
-CONFIG_U_SERIAL_CONSOLE=y
 CONFIG_USB_ASPEED_VHUB=y
 CONFIG_USB_CONFIGFS=y
-CONFIG_USB_CONFIGFS_SERIAL=y
-CONFIG_USB_CONFIGFS_ACM=y
-CONFIG_USB_CONFIGFS_OBEX=y
-CONFIG_USB_CONFIGFS_NCM=y
-CONFIG_USB_CONFIGFS_ECM=y
-CONFIG_USB_CONFIGFS_ECM_SUBSET=y
-CONFIG_USB_CONFIGFS_RNDIS=y
-CONFIG_USB_CONFIGFS_EEM=y
 CONFIG_USB_CONFIGFS_MASS_STORAGE=y
-CONFIG_USB_CONFIGFS_F_LB_SS=y
-CONFIG_USB_CONFIGFS_F_FS=y
 CONFIG_USB_CONFIGFS_F_HID=y
-CONFIG_USB_CONFIGFS_F_PRINTER=y
 CONFIG_MMC=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_PLTFM=y
 CONFIG_MMC_SDHCI_OF_ASPEED=y
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+CONFIG_LEDS_CLASS_FLASH=y
+CONFIG_LEDS_GPIO=y
+CONFIG_LEDS_PCA955X=y
+CONFIG_LEDS_PCA955X_GPIO=y
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=y
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
 CONFIG_EDAC=y
 # CONFIG_EDAC_LEGACY_SYSFS is not set
 CONFIG_EDAC_ASPEED=y
 CONFIG_RTC_CLASS=y
+CONFIG_RTC_DRV_DS1307=y
+CONFIG_RTC_DRV_PCF8523=y
+CONFIG_RTC_DRV_RV8803=y
 CONFIG_RTC_DRV_ASPEED=y
 # CONFIG_VIRTIO_MENU is not set
 # CONFIG_IOMMU_SUPPORT is not set
-CONFIG_ASPEED_ESPI=y
-CONFIG_AST_VIDEO=y
-CONFIG_ASPEED_JTAG=y
-CONFIG_ASPEED_MCTP=y
-CONFIG_ASPEED_XDMA=y
+CONFIG_ASPEED_LPC_CTRL=y
+CONFIG_ASPEED_LPC_SNOOP=y
+CONFIG_ASPEED_P2A_CTRL=y
 CONFIG_IIO=y
-CONFIG_IIO_BUFFER=y
-CONFIG_IIO_KFIFO_BUF=y
-CONFIG_IIO_CONFIGFS=y
 CONFIG_ASPEED_ADC=y
+CONFIG_MAX1363=y
+CONFIG_BMP280=y
+CONFIG_DPS310=y
 CONFIG_RAS=y
+CONFIG_FSI=y
+CONFIG_FSI_MASTER_HUB=y
+CONFIG_FSI_MASTER_ASPEED=y
+CONFIG_FSI_SCOM=y
+CONFIG_FSI_SBEFIFO=y
+CONFIG_FSI_OCC=y
 CONFIG_PECI=y
 CONFIG_PECI_ASPEED=y
-CONFIG_EXT2_FS=y
+CONFIG_EXT4_FS=y
 CONFIG_FANOTIFY=y
 CONFIG_OVERLAY_FS=y
 CONFIG_TMPFS=y
@@ -265,7 +259,6 @@ CONFIG_SQUASHFS_ZSTD=y
 # CONFIG_NETWORK_FILESYSTEMS is not set
 CONFIG_HARDENED_USERCOPY=y
 CONFIG_FORTIFY_SOURCE=y
-# CONFIG_CRYPTO_ECHAINIV is not set
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_USER_API_HASH=y
@@ -282,6 +275,8 @@ CONFIG_DEBUG_INFO_DWARF4=y
 CONFIG_GDB_SCRIPTS=y
 CONFIG_STRIP_ASM_SYMS=y
 CONFIG_SOFTLOCKUP_DETECTOR=y
+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC=y
+CONFIG_BOOTPARAM_HUNG_TASK_PANIC=y
 CONFIG_WQ_WATCHDOG=y
 CONFIG_PANIC_ON_OOPS=y
 CONFIG_PANIC_TIMEOUT=-1
@@ -291,8 +286,3 @@ CONFIG_FUNCTION_TRACER=y
 # CONFIG_RUNTIME_TESTING_MENU is not set
 CONFIG_DEBUG_WX=y
 CONFIG_DEBUG_USER=y
-CONFIG_DEBUG_LL=y
-CONFIG_DEBUG_LL_UART_8250=y
-CONFIG_DEBUG_UART_PHYS=0x1e784000
-CONFIG_DEBUG_UART_VIRT=0xf8184000
-CONFIG_EARLY_PRINTK=y
diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb b/meta-aspeed/recipes-kernel/linux/linux-aspeed_git.bb
index 09128491c..da191586e 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.2"
-LINUX_VERSION ?= "5.2"
+KBRANCH ?= "dev-5.3"
+LINUX_VERSION ?= "5.3.6"
 
-SRCREV="c01e98d1513042ae46909302c0b49a5db600e4a1"
+SRCREV="62d45cc8d76110a9e8e9107ff91420e89ef01681"
 
 require linux-aspeed.inc