From 143c81716dde81251fc9844f2fbe32846685de26 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sat, 27 Jun 2020 18:38:12 +0200 Subject: [PATCH] uboot-kirkwood: Revert "uboot-kirkwood: enable sata in nsa310 uboot" This reverts commit 930f3c014821df423507c878415c7fb4910a454d. The build fails with the following build error: arm-openwrt-linux-muslgnueabi-ld.bfd: drivers/built-in.o: in function `ide_init': build_dir/target-arm_xscale_musl_eabi/u-boot-nsa310/u-boot-2020.04/drivers/block/ide.c:750: undefined reference to `ide_preinit' make[4]: *** [Makefile:1700: u-boot] Error 1 Signed-off-by: Hauke Mehrtens --- .../uboot-kirkwood/patches/007-nsa310-uboot-generic.patch | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/package/boot/uboot-kirkwood/patches/007-nsa310-uboot-generic.patch b/package/boot/uboot-kirkwood/patches/007-nsa310-uboot-generic.patch index eea561fab8..09dc587bf7 100644 --- a/package/boot/uboot-kirkwood/patches/007-nsa310-uboot-generic.patch +++ b/package/boot/uboot-kirkwood/patches/007-nsa310-uboot-generic.patch @@ -505,7 +505,7 @@ NOTE: this patch is ready for upstream, LEDE-specific parts are in +#endif /* __NSA310_H */ --- /dev/null +++ b/configs/nsa310_defconfig -@@ -0,0 +1,50 @@ +@@ -0,0 +1,48 @@ +CONFIG_ARM=y +CONFIG_SYS_DCACHE_OFF=y +CONFIG_ARCH_CPU_INIT=y @@ -554,8 +554,6 @@ NOTE: this patch is ready for upstream, LEDE-specific parts are in +CONFIG_LZMA=y +CONFIG_LZO=y +CONFIG_SYS_LONGHELP=y -+CONFIG_SATA_MV=y -+CONFIG_CMD_IDE=y --- /dev/null +++ b/include/configs/nsa310.h @@ -0,0 +1,103 @@ -- 2.25.1