From 0457dc4652c5d7bd0f1e9bf2284b2d0bc75d667d Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin" Date: Thu, 12 Mar 2009 13:43:14 -0700 Subject: [PATCH] --- yaml --- r: 138743 b: refs/heads/master c: 16a6791934a1077609482dd6c091aa8b4c39a834 h: refs/heads/master i: 138741: 17069fa7239c06cbfe6e806cc3e59c46e8eb2072 138739: 7804ddeae64796ef5fbf41b43db949b0213d6460 138735: b425fe7498c67e7c3236dfd9003447438d0f23b9 v: v3 --- [refs] | 2 +- trunk/arch/x86/Makefile | 4 ---- trunk/arch/x86/boot/Makefile | 1 + 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index dcc11c17ae65..466d66c0e051 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f9c5107c2bcad91dd56d23888653d7bfa1a9696e +refs/heads/master: 16a6791934a1077609482dd6c091aa8b4c39a834 diff --git a/trunk/arch/x86/Makefile b/trunk/arch/x86/Makefile index 43bd89c67e3a..f05d8c91d9e5 100644 --- a/trunk/arch/x86/Makefile +++ b/trunk/arch/x86/Makefile @@ -194,7 +194,3 @@ define archhelp echo ' FDARGS="..." arguments for the booted kernel' echo ' FDINITRD=file initrd for the booted kernel' endef - -CLEAN_FILES += arch/x86/boot/fdimage \ - arch/x86/boot/image.iso \ - arch/x86/boot/mtools.conf \ No newline at end of file diff --git a/trunk/arch/x86/boot/Makefile b/trunk/arch/x86/boot/Makefile index 2a3db75b35c3..fb737ce5888d 100644 --- a/trunk/arch/x86/boot/Makefile +++ b/trunk/arch/x86/boot/Makefile @@ -23,6 +23,7 @@ ROOT_DEV := CURRENT SVGA_MODE := -DSVGA_MODE=NORMAL_VGA targets := vmlinux.bin setup.bin setup.elf bzImage +targets += fdimage fdimage144 fdimage288 image.iso mtools.conf subdir- := compressed setup-y += a20.o cmdline.o copy.o cpu.o cpucheck.o edd.o