voron

experimental ARM OS
git clone git://git.2f30.org/voron.git
Log | Files | Refs | LICENSE

commit ae458ce4684c1037607c36056de907dec3631cb5
parent 0d5500bc2cfc9e1a8191b9348c5dcf0ff51998fe
Author: oblique <psyberbits@gmail.com>
Date:   Sat May 25 05:24:36 +0300

Remove submodules, add `git clone' of them

Diffstat:
.gitignore | 2++
.gitmodules | 6------
Makefile | 4++--
boot/omap4boot | 1-
boot/u-boot-linaro-stable | 1-
scripts/panda_usbboot.sh | 15++++++++++-----
6 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/.gitignore b/.gitignore @@ -10,3 +10,5 @@ /uImage /voron.tar.gz /boot/boot.scr +/boot/omap4boot +/boot/u-boot-linaro-stable diff --git a/.gitmodules b/.gitmodules @@ -1,6 +0,0 @@ -[submodule "boot/omap4boot"] - path = boot/omap4boot - url = git://github.com/swetland/omap4boot.git -[submodule "boot/u-boot-linaro-stable"] - path = boot/u-boot-linaro-stable - url = git://git.linaro.org/boot/u-boot-linaro-stable.git diff --git a/Makefile b/Makefile @@ -44,8 +44,8 @@ uImage: kernel.bin @$(CC) $(ASFLAGS) -c -o $@ $< bootloader: - git submodule init - git submodule update + [ -d boot/u-boot-linaro-stable ] || (cd boot && \ + git clone git://git.linaro.org/boot/u-boot-linaro-stable.git) make -C boot/u-boot-linaro-stable CROSS_COMPILE=$(CROSS_COMPILE) omap4_panda_config make -C boot/u-boot-linaro-stable CROSS_COMPILE=$(CROSS_COMPILE) cd boot && mkimage -A arm -T script -C none -a 0 -e 0 -n "Panda SD Boot" -d boot_sd.conf boot.scr diff --git a/boot/omap4boot b/boot/omap4boot @@ -1 +0,0 @@ -Subproject commit b6c998113173e38655c8c9b40d88776992bdcd78 diff --git a/boot/u-boot-linaro-stable b/boot/u-boot-linaro-stable @@ -1 +0,0 @@ -Subproject commit 30dd996a40c7673258bd5743c0813230d92abc7c diff --git a/scripts/panda_usbboot.sh b/scripts/panda_usbboot.sh @@ -16,13 +16,18 @@ if [ ! -f "$BIN" ]; then fi if [ -z "$OMAP4BOOT_PATH" ]; then + if [ ! -d "boot/omap4boot" ]; then + cd boot + git clone git://github.com/swetland/omap4boot.git + cd omap4boot + patch -p1 -i ../omap4boot_remove_signature_check.patch + cd ../.. + fi + OMAP4BOOT_PATH="${PWD}/boot/omap4boot/out/panda" + if [ ! -f "${OMAP4BOOT_PATH}/usbboot" -o ! -f "${OMAP4BOOT_PATH}/aboot.bin" ]; then - git submodule init || exit 1 - git submodule update || exit 1 - cd boot/omap4boot || exit 1 - git reset --hard - patch -p1 -i ../omap4boot_remove_signature_check.patch + cd boot/omap4boot if [ -z "$TOOLCHAIN" ]; then make TOOLCHAIN=arm-none-eabi- else