From 1ceee39cebea8e42cdc1253f39dff3aa862ae289 Mon Sep 17 00:00:00 2001 From: Xiangfu Liu Date: Fri, 22 Oct 2010 15:09:16 +0800 Subject: [PATCH] cleanup scripts/build a little. make it save un-commit stuff by git stash Signed-off-by: Xiangfu Liu --- package/uboot-xburst/files/drivers/mmc/jz_mmc.c | 2 -- scripts/build | 10 ++++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/uboot-xburst/files/drivers/mmc/jz_mmc.c b/package/uboot-xburst/files/drivers/mmc/jz_mmc.c index 18352ddc8..72b448af8 100644 --- a/package/uboot-xburst/files/drivers/mmc/jz_mmc.c +++ b/package/uboot-xburst/files/drivers/mmc/jz_mmc.c @@ -29,9 +29,7 @@ #include #include "jz_mmc.h" -#define CFG_MMC_BASE 0x80600000 static int sd2_0 = 0; -static uchar mmc_buf[1024]; static int mmc_ready = 0; static int use_4bit; /* Use 4-bit data bus */ /* diff --git a/scripts/build b/scripts/build index a51acf097..b6c16f773 100755 --- a/scripts/build +++ b/scripts/build @@ -32,8 +32,9 @@ if [ -f "config" ]; then fi echo "This script will move previous builds to bak/!" -echo "This script will reset modifications you made" -echo " to files which are part of the repository!" +echo "This script will compile base on last commit" +echo " your modifications will backup by git stash" +echo " those modifications will apply again after compile" echo "This script comes without any kind of warranty!" echo " " echo "Are you brave, dude? [NO/yes]" @@ -58,8 +59,7 @@ mv .config config mkdir xburst echo "updating git repo..." -git diff > bak/modify_${DATE_TIME}.patch -git checkout -f +git stash git checkout tracking_backfire git pull > /dev/null if [ "$?" != "0" ]; then @@ -122,6 +122,8 @@ if [ "$?" != "0" ]; then exit 1 fi +git stash pop + cp .config xburst/config cp bin/xburst/* xburst/ 2>/dev/null mkdir xburst/files