Date: Wed, 4 Jul 2012 12:57:35 +0000 (UTC) From: "Andrey V. Elsukov" <ae@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r238098 - in user/ae/bootcode/sys/boot: arm/uboot common powerpc/uboot Message-ID: <201207041257.q64CvZmE011544@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ae Date: Wed Jul 4 12:57:34 2012 New Revision: 238098 URL: http://svn.freebsd.org/changeset/base/238098 Log: Add an ability to build ubtldr without disks support for the arm and powerpc arches. Also simplify condition in the common code. Modified: user/ae/bootcode/sys/boot/arm/uboot/Makefile user/ae/bootcode/sys/boot/common/Makefile.inc user/ae/bootcode/sys/boot/powerpc/uboot/Makefile Modified: user/ae/bootcode/sys/boot/arm/uboot/Makefile ============================================================================== --- user/ae/bootcode/sys/boot/arm/uboot/Makefile Wed Jul 4 12:54:56 2012 (r238097) +++ user/ae/bootcode/sys/boot/arm/uboot/Makefile Wed Jul 4 12:57:34 2012 (r238098) @@ -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 @@ -36,12 +40,6 @@ LOADER_FDT_SUPPORT= no .if ${LOADER_DISK_SUPPORT} == "yes" CFLAGS+= -DLOADER_DISK_SUPPORT -.if !defined(LOADER_NO_MBR_SUPPORT) -CFLAGS+= -DLOADER_MBR_SUPPORT -.endif -.if !defined(LOADER_NO_GPT_SUPPORT) -CFLAGS+= -DLOADER_GPT_SUPPORT -.endif .endif .if ${LOADER_UFS_SUPPORT} == "yes" CFLAGS+= -DLOADER_UFS_SUPPORT Modified: user/ae/bootcode/sys/boot/common/Makefile.inc ============================================================================== --- user/ae/bootcode/sys/boot/common/Makefile.inc Wed Jul 4 12:54:56 2012 (r238097) +++ user/ae/bootcode/sys/boot/common/Makefile.inc Wed Jul 4 12:57:34 2012 (r238098) @@ -24,8 +24,7 @@ SRCS+= load_elf64.c reloc_elf64.c SRCS+= dev_net.c .endif -.if !defined(LOADER_NO_DISK_SUPPORT) || - (defined(LOADER_DISK_SUPPORT) && ${LOADER_DISK_SUPPORT} != "no") +.if !defined(LOADER_NO_DISK_SUPPORT) SRCS+= disk.c part.c CFLAGS+= -DLOADER_DISK_SUPPORT .if !defined(LOADER_NO_GPT_SUPPORT) Modified: user/ae/bootcode/sys/boot/powerpc/uboot/Makefile ============================================================================== --- user/ae/bootcode/sys/boot/powerpc/uboot/Makefile Wed Jul 4 12:54:56 2012 (r238097) +++ user/ae/bootcode/sys/boot/powerpc/uboot/Makefile Wed Jul 4 12:57:34 2012 (r238098) @@ -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 @@ -29,12 +33,6 @@ LOADER_FDT_SUPPORT= no .if ${LOADER_DISK_SUPPORT} == "yes" CFLAGS+= -DLOADER_DISK_SUPPORT -.if !defined(LOADER_NO_MBR_SUPPORT) -CFLAGS+= -DLOADER_MBR_SUPPORT -.endif -.if !defined(LOADER_NO_GPT_SUPPORT) -CFLAGS+= -DLOADER_GPT_SUPPORT -.endif .endif .if ${LOADER_UFS_SUPPORT} == "yes" CFLAGS+= -DLOADER_UFS_SUPPORT
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201207041257.q64CvZmE011544>