From da1d05228cb46bda846678441a5db8ccea321458 Mon Sep 17 00:00:00 2001 From: "Andrey V. Elsukov" Date: Sun, 9 Sep 2012 11:40:37 +0000 Subject: [PATCH] Handle LOADER_NO_DISK_SUPPORT knob in the arm and powerpc ubldr. --- sys/boot/arm/uboot/Makefile | 4 ++++ sys/boot/powerpc/uboot/Makefile | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/sys/boot/arm/uboot/Makefile b/sys/boot/arm/uboot/Makefile index b8a92d6ddf64..c9940edcb8af 100644 --- a/sys/boot/arm/uboot/Makefile +++ b/sys/boot/arm/uboot/Makefile @@ -14,7 +14,11 @@ UBLDR_LOADADDR?= 0x1000000 # Architecture-specific loader code SRCS= start.S conf.c vers.c +.if !defined(LOADER_NO_DISK_SUPPORT) LOADER_DISK_SUPPORT?= yes +.else +LOADER_DISK_SUPPORT= no +.endif LOADER_UFS_SUPPORT?= yes LOADER_CD9660_SUPPORT?= no LOADER_EXT2FS_SUPPORT?= no diff --git a/sys/boot/powerpc/uboot/Makefile b/sys/boot/powerpc/uboot/Makefile index 6ba738fd39a7..783694d7f093 100644 --- a/sys/boot/powerpc/uboot/Makefile +++ b/sys/boot/powerpc/uboot/Makefile @@ -12,7 +12,11 @@ NO_MAN= SRCS= start.S conf.c vers.c SRCS+= ucmpdi2.c +.if !defined(LOADER_NO_DISK_SUPPORT) LOADER_DISK_SUPPORT?= yes +.else +LOADER_DISK_SUPPORT= no +.endif LOADER_UFS_SUPPORT?= yes LOADER_CD9660_SUPPORT?= no LOADER_EXT2FS_SUPPORT?= no