From 097b4049f42b9ff70615c35578dccf1fd523b1be Mon Sep 17 00:00:00 2001
From: Travis Glenn Hansen <travisghansen@yahoo.com>
Date: Tue, 7 Jun 2011 11:35:37 -0600
Subject: [PATCH] making init check for /flash/MACH_KERNEL instead of
 /flash/atv_single_boot for update forcefully disabling when 'nvidia' is in
 the list of GRAPHIC_DRIVERS letting atv-bootloader include default initrd in
 the kernel

---
 packages/initramfs/sysutils/busybox-initramfs/scripts/init | 2 +-
 packages/linux/unpack                                      | 2 ++
 packages/tools/atv-bootloader/build                        | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/initramfs/sysutils/busybox-initramfs/scripts/init b/packages/initramfs/sysutils/busybox-initramfs/scripts/init
index 127fb8348a..87281929ff 100755
--- a/packages/initramfs/sysutils/busybox-initramfs/scripts/init
+++ b/packages/initramfs/sysutils/busybox-initramfs/scripts/init
@@ -120,7 +120,7 @@ REBOOT="0"
 
   mount_part "$boot" "/flash" "ro,noatime"
 
-  if [ -f "/flash/atv_single_boot" ]; then
+  if [ -f "/flash/MACH_KERNEL" ]; then
     IMAGE_KERNEL="MACH_KERNEL"
   fi
 
diff --git a/packages/linux/unpack b/packages/linux/unpack
index 9523cd3a1a..60df5d8b7f 100755
--- a/packages/linux/unpack
+++ b/packages/linux/unpack
@@ -41,6 +41,8 @@ cp $KERNEL_CFG_FILE $LINUX/.config
 sed -i -e "s|^CONFIG_INITRAMFS_SOURCE=.*$|CONFIG_INITRAMFS_SOURCE=\"$ROOT/$BUILD/image/initramfs.cpio\"|" \
   $LINUX/.config
 
+# wipe out nouveau if GRAPHICS_DRIVERS contains nvidia
+echo $GRAPHIC_DRIVERS | grep "nvidia" &>/dev/null && sed -i '/NOUVEAU/ d' $LINUX/.config && echo "# CONFIG_DRM_NOUVEAU is not set" >> $LINUX/.config
 # copy some extra firmware to linux tree
   cp -R $PKG_DIR/firmware/* $LINUX/firmware
 
diff --git a/packages/tools/atv-bootloader/build b/packages/tools/atv-bootloader/build
index e2834b3f91..423f7d5dbe 100755
--- a/packages/tools/atv-bootloader/build
+++ b/packages/tools/atv-bootloader/build
@@ -27,7 +27,7 @@ cd $PKG_BUILD
 cp -PR $(kernel_path)/arch/x86/boot/bzImage vmlinuz
 
 make clean
-make LDFLAGS="" KERN_OBJ="vmlinuz.obj" \
+make LDFLAGS="" \
      CC="$ROOT/$BUILD/darwin-cross/bin/i386-apple-darwin8-gcc-4.0.1" \
      LD="$ROOT/$BUILD/darwin-cross/bin/i386-apple-darwin8-ld"