voron

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

commit 0415ef05abb1b53482a2be14bb0bb20b09704955
parent 32db212acdd66595ace49ca529193691189fe681
Author: oblique <psyberbits@gmail.com>
Date:   Thu May 23 20:42:37 +0300

rename `usbboot' to `boot'

Diffstat:
.gitmodules | 4++--
boot/omap4boot | 1+
boot/omap4boot_remove_signature_check.patch | 25+++++++++++++++++++++++++
scripts/panda_usbboot.sh | 6+++---
usbboot/omap4boot | 1-
usbboot/omap4boot_remove_signature_check.patch | 25-------------------------
6 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/.gitmodules b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "usbboot/omap4boot"] - path = usbboot/omap4boot +[submodule "boot/omap4boot"] + path = boot/omap4boot url = git://github.com/swetland/omap4boot.git diff --git a/boot/omap4boot b/boot/omap4boot @@ -0,0 +1 @@ +Subproject commit b6c998113173e38655c8c9b40d88776992bdcd78 diff --git a/boot/omap4boot_remove_signature_check.patch b/boot/omap4boot_remove_signature_check.patch @@ -0,0 +1,25 @@ +diff --git a/Makefile b/Makefile +index 5d4c674..800ca9d 100644 +--- a/Makefile ++++ b/Makefile +@@ -85,7 +85,6 @@ M_OBJS += libc/printf.o + M_OBJS += libc/strlen.o libc/memset.o libc/memcpy.o + M_OBJS += libc/raise.o + M_OBJS += aboot.o +-M_OBJS += trusted.o + M_OBJS += boot.o + M_OBJS += misc.o + M_LIBS := $(TARGET_LIBGCC) +diff --git a/aboot.c b/aboot.c +index 6c12694..126e40a 100644 +--- a/aboot.c ++++ b/aboot.c +@@ -34,7 +34,7 @@ + + #define WITH_MEMORY_TEST 0 + #define WITH_FLASH_BOOT 0 +-#define WITH_SIGNATURE_CHECK 1 ++#define WITH_SIGNATURE_CHECK 0 + + #if WITH_MEMORY_TEST + void memtest(void *x, unsigned count) { diff --git a/scripts/panda_usbboot.sh b/scripts/panda_usbboot.sh @@ -16,11 +16,11 @@ if [ ! -f "$BIN" ]; then fi if [ -z "$OMAP4BOOT_PATH" ]; then - OMAP4BOOT_PATH="${PWD}/usbboot/omap4boot/out/panda" - if [ ! -f "${OMAP4BOOT_PATH}/usbboot" -o ! -f "${OMAP4BOOT_PATH}/aboot.bin" ]; then + OMAP4BOOT_PATH="${PWD}/boot/omap4boot/out/panda" + if [ ! -f "${OMAP4BOOT_PATH}/boot" -o ! -f "${OMAP4BOOT_PATH}/aboot.bin" ]; then git submodule init || exit 1 git submodule update || exit 1 - cd usbboot/omap4boot || exit 1 + cd boot/omap4boot || exit 1 git reset --hard patch -p1 -i ../omap4boot_remove_signature_check.patch if [ -z "$TOOLCHAIN" ]; then diff --git a/usbboot/omap4boot b/usbboot/omap4boot @@ -1 +0,0 @@ -Subproject commit b6c998113173e38655c8c9b40d88776992bdcd78 diff --git a/usbboot/omap4boot_remove_signature_check.patch b/usbboot/omap4boot_remove_signature_check.patch @@ -1,25 +0,0 @@ -diff --git a/Makefile b/Makefile -index 5d4c674..800ca9d 100644 ---- a/Makefile -+++ b/Makefile -@@ -85,7 +85,6 @@ M_OBJS += libc/printf.o - M_OBJS += libc/strlen.o libc/memset.o libc/memcpy.o - M_OBJS += libc/raise.o - M_OBJS += aboot.o --M_OBJS += trusted.o - M_OBJS += boot.o - M_OBJS += misc.o - M_LIBS := $(TARGET_LIBGCC) -diff --git a/aboot.c b/aboot.c -index 6c12694..126e40a 100644 ---- a/aboot.c -+++ b/aboot.c -@@ -34,7 +34,7 @@ - - #define WITH_MEMORY_TEST 0 - #define WITH_FLASH_BOOT 0 --#define WITH_SIGNATURE_CHECK 1 -+#define WITH_SIGNATURE_CHECK 0 - - #if WITH_MEMORY_TEST - void memtest(void *x, unsigned count) {