diff --git a/meta-fii/meta-kudo/conf/layer.conf b/meta-fii/meta-kudo/conf/layer.conf
index e5a3c34..84da9fb 100644
--- a/meta-fii/meta-kudo/conf/layer.conf
+++ b/meta-fii/meta-kudo/conf/layer.conf
@@ -7,4 +7,4 @@
 
 BBFILE_COLLECTIONS += "kudo-layer"
 BBFILE_PATTERN_kudo-layer = "^${LAYERDIR}/"
-LAYERSERIES_COMPAT_kudo-layer = "warrior zeus dunfell"
+LAYERSERIES_COMPAT_kudo-layer = "warrior zeus gatesgarth dunfell"
diff --git a/meta-fii/meta-kudo/conf/machine/kudo.conf b/meta-fii/meta-kudo/conf/machine/kudo.conf
index 31036a4..e438f96 100644
--- a/meta-fii/meta-kudo/conf/machine/kudo.conf
+++ b/meta-fii/meta-kudo/conf/machine/kudo.conf
@@ -7,8 +7,8 @@
 FLASH_SIZE = "65536"
 FLASH_UBOOT_OFFSET = "0"
 FLASH_KERNEL_OFFSET = "2048"
-FLASH_ROFS_OFFSET = "8192"
-FLASH_RWFS_OFFSET = "62464"
+FLASH_ROFS_OFFSET = "7168"
+FLASH_RWFS_OFFSET = "62400"
 
 UBOOT_MACHINE = "PolegSVB_config"
 UBOOT_DEVICETREE = "nuvoton-npcm730-kudo"
@@ -16,6 +16,10 @@
 
 IMAGE_FSTYPES += " cpio.${INITRAMFS_CTYPE}.u-boot"
 
+OBMC_MACHINE_FEATURES += " \
+    obmc-host-ipmi \
+    "
+
 VIRTUAL-RUNTIME_obmc-fan-control = "phosphor-pid-control"
 PREFERRED_PROVIDER_virtual/obmc-fan-control = "phosphor-pid-control"
 PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-kudo-apps"
diff --git a/meta-fii/meta-kudo/recipes-bsp/u-boot/u-boot-common-kudo.inc b/meta-fii/meta-kudo/recipes-bsp/u-boot/u-boot-common-kudo.inc
deleted file mode 100644
index 9154bc1..0000000
--- a/meta-fii/meta-kudo/recipes-bsp/u-boot/u-boot-common-kudo.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-UBRANCH = "npcm7xx-v2019.01"
-SRC_URI = "git://github.com/Nuvoton-Israel/u-boot.git;branch=${UBRANCH}"
-SRCREV = "5caf59416ba1d6316dd78895e69789246a77e00a"
diff --git a/meta-fii/meta-kudo/recipes-bsp/u-boot/u-boot-nuvoton/fixed_phy.cfg b/meta-fii/meta-kudo/recipes-bsp/u-boot/u-boot-nuvoton/fixed_phy.cfg
deleted file mode 100644
index 125522f..0000000
--- a/meta-fii/meta-kudo/recipes-bsp/u-boot/u-boot-nuvoton/fixed_phy.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-CONFIG_PHY_FIXED=y
-
diff --git a/meta-fii/meta-kudo/recipes-bsp/u-boot/u-boot-nuvoton/kudo.cfg b/meta-fii/meta-kudo/recipes-bsp/u-boot/u-boot-nuvoton/kudo.cfg
index 417ffa9..58839d9 100644
--- a/meta-fii/meta-kudo/recipes-bsp/u-boot/u-boot-nuvoton/kudo.cfg
+++ b/meta-fii/meta-kudo/recipes-bsp/u-boot/u-boot-nuvoton/kudo.cfg
@@ -1,2 +1,3 @@
+CONFIG_PHY_FIXED=y
 CONFIG_CMD_MII=y
 CONFIG_NET_RANDOM_ETHADDR=y
diff --git a/meta-fii/meta-kudo/recipes-bsp/u-boot/u-boot-nuvoton_%.bbappend b/meta-fii/meta-kudo/recipes-bsp/u-boot/u-boot-nuvoton_%.bbappend
index 73ad51e..070059ba 100644
--- a/meta-fii/meta-kudo/recipes-bsp/u-boot/u-boot-nuvoton_%.bbappend
+++ b/meta-fii/meta-kudo/recipes-bsp/u-boot/u-boot-nuvoton_%.bbappend
@@ -1,10 +1,5 @@
 FILESEXTRAPATHS_prepend_kudo := "${THISDIR}/u-boot-nuvoton:"
 
-require u-boot-common-kudo.inc
-
 UBOOT_MAKE_TARGET_append_kudo = " DEVICE_TREE=${UBOOT_DEVICETREE}"
 
-SRC_URI_append_kudo = " \
-			file://fixed_phy.cfg \
-			file://kudo.cfg \
-			"
+SRC_URI_append_kudo = " file://kudo.cfg"