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-imx6/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/u-boot-imx6/Makefile') diff --git a/package/u-boot-imx6/Makefile b/package/u-boot-imx6/Makefile index 032c08c52..2d6330525 100644 --- a/package/u-boot-imx6/Makefile +++ b/package/u-boot-imx6/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 20140416 PKG_RELEASE:= 1 PKG_MD5SUM:= f2a5f697670c340eef8074f6a5f26476 PKG_DESCR:= bootloader for imx6 (cubox-i) -PKG_SECTION:= boot +PKG_SECTION:= base/boot PKG_URL:= https://github.com/SolidRun/u-boot-imx6.git PKG_SITES:= http://openadk.org/distfiles/ -- cgit v1.2.3