From d22ca436f7ba07492f438aee6618230811ee96f5 Mon Sep 17 00:00:00 2001 From: Joerg Deckert Date: Tue, 6 May 2014 08:36:29 +0200 Subject: [PATCH] first changes for the HIVE --- build_boot | 2 +- build_spinix | 8 +++++++- src/boot.spin | 9 +++++++++ src/clibsd.bin | Bin 14512 -> 0 bytes 4 files changed, 17 insertions(+), 2 deletions(-) delete mode 100644 src/clibsd.bin diff --git a/build_boot b/build_boot index 79909e0..607fb8b 100755 --- a/build_boot +++ b/build_boot @@ -5,5 +5,5 @@ sd="${bin}/sdcard" flash="${bin}/flash" # Build the the boot program -bstc -b -O cgru src/boot.spin +bstc -D __HIVE -b -O a src/boot.spin mv boot.binary ${flash}/ diff --git a/build_spinix b/build_spinix index 4f26fc8..1dd4fab 100755 --- a/build_spinix +++ b/build_spinix @@ -25,8 +25,14 @@ cp license.txt ${sd} cp src/_shellrc ${sd}/bin # Generate _sysparm and copy to root +# - UNIX Time +# - timezone config shell_level +# - ifflag whileflag scriptline +# - ENV variable 1 +# - ... +# - ENV variable n date +%s >${sd}/_sysparm -echo -6 3 0 >>${sd}/_sysparm +echo 1 1 0 >>${sd}/_sysparm echo 0 0 0 >>${sd}/_sysparm echo "GPWD /" >>${sd}/_sysparm echo "LSCRIPT_FILE /bin/_shellrc" >>${sd}/_sysparm diff --git a/src/boot.spin b/src/boot.spin index 240c5f6..0f48e73 100644 --- a/src/boot.spin +++ b/src/boot.spin @@ -22,12 +22,15 @@ VAR DAT pins byte 255[4] +#ifndef __HIVE sd_names byte "DO ", 0, "CLK", 0, "DI ", 0, "CS ", 0 +#endif PUB main | i, ptr, infile, handle longfill(sys#rendezvous, 0, ($8000 - sys#rendezvous)/4) c.start if pins == 255 +#ifndef __HIVE repeat c.printf0(string("Press any key to start\n")) if ser.rxtime(1000) <> -1 @@ -38,6 +41,12 @@ PUB main | i, ptr, infile, handle c.scanf1(string("%d"), @result) pins[i] := result ptr += 4 +#else + pins[0] := 10 + pins[1] := 11 + pins[2] := 12 + pins[3] := 13 +#endif WriteEEPromLong(eeprom_pin, @pins) spi.start_explicit(pins, pins[1], pins[2], pins[3]) c.mount_explicit(pins, pins[1], pins[2], pins[3]) diff --git a/src/clibsd.bin b/src/clibsd.bin deleted file mode 100644 index 37d719d946b9e994741f755870b9cd48a8f08bce..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14512 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