From f14c1fc5515445840d2fbe3350cff0c03eae0b55 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 29 May 2014 11:40:49 +0200 Subject: resolve merge conflict --- package/u-boot/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/u-boot/Makefile') diff --git a/package/u-boot/Makefile b/package/u-boot/Makefile index 361339aec..fb0858f7b 100644 --- a/package/u-boot/Makefile +++ b/package/u-boot/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 2014.01 PKG_RELEASE:= 1 PKG_MD5SUM:= e531307578f6d32a7ccb1d04f1e08cbc PKG_DESCR:= bootloader -PKG_SECTION:= boot +PKG_SECTION:= base/boot PKG_URL:= http://www.denx.de/wiki/U-Boot PKG_SITES:= ftp://ftp.denx.de/pub/u-boot/ -- cgit v1.2.3