diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2020-06-27 18:38:12 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2020-06-27 18:39:32 +0200 |
| commit | 143c81716dde81251fc9844f2fbe32846685de26 (patch) | |
| tree | 778b73abe4b200c5d13d02ef2e43464ee60fb3aa | |
| parent | b1d5ab1a698b05d7522df029a85f8078ee4217af (diff) | |
| download | upstream-143c81716dde81251fc9844f2fbe32846685de26.tar.gz upstream-143c81716dde81251fc9844f2fbe32846685de26.tar.bz2 upstream-143c81716dde81251fc9844f2fbe32846685de26.zip | |
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 <hauke@hauke-m.de>
| -rw-r--r-- | package/boot/uboot-kirkwood/patches/007-nsa310-uboot-generic.patch | 4 |
1 files changed, 1 insertions, 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 @@ |