diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..103b852 --- /dev/null +++ b/Makefile @@ -0,0 +1,28 @@ + +export VERSION=1.4.0.1 +export TOOLCHAIN_PREFIX=arm-none-eabi- + +default: bin/RUU_signed.nbh + +clean: + $(MAKE) -C lk htcleo clean + rm -rf lk/build-htcleo + rm -rf bin/nbgen + rm -rf bin/lk.bin + rm -rf bin/os.nb.payload + rm -rf bin/os.nb + rm -rf bin/RUU_signed.nbh + +bin/nbgen: + gcc -std=c99 nbgen.c -o bin/nbgen + +bin/RUU_signed.nbh: bin/nbgen + $(MAKE) -C lk htcleo DEBUG=1 + cp lk/build-htcleo/lk.bin bin/ + cd bin ; ./nbgen os.nb + cd bin ; ./yang -F RUU_signed.nbh -f os.nb -t 0x400 -s 64 -d PB8110000 -c 11111111 -v CLK$(VERSION) -l WWE + +partition: + rm -rf lk/build-htcleo/target/htcleo/init.* + rm -rf bin/RUU_signed.nbh + $(MAKE) diff --git a/lk/app/aboot/aboot.c b/lk/app/aboot/aboot.c index 16f5d12..154cbad 100644 --- a/lk/app/aboot/aboot.c +++ b/lk/app/aboot/aboot.c @@ -46,6 +46,7 @@ #include "recovery.h" #include "bootimg.h" #include "fastboot.h" +#include "version.h" #define EXPAND(NAME) #NAME #define TARGET(NAME) EXPAND(NAME) @@ -292,6 +293,9 @@ unified_boot: } else { cmdline = DEFAULT_CMDLINE; } + strcat(cmdline," clk="); + strcat(cmdline,cLK_version); + dprintf(INFO, "cmdline = '%s'\n", cmdline); dprintf(INFO, "\nBooting Linux\n"); @@ -384,6 +388,9 @@ continue_boot: } else { cmdline = DEFAULT_CMDLINE; } + strcat(cmdline," clk="); + strcat(cmdline,cLK_version); + dprintf(INFO, "cmdline = '%s'\n", cmdline); /* TODO: create/pass atags to kernel */ diff --git a/lk/include/version.h b/lk/include/version.h new file mode 100644 index 0000000..de74afa --- /dev/null +++ b/lk/include/version.h @@ -0,0 +1,6 @@ +fndef __VERSION_H +#define __VERSION_H + +static const char *cLK_version = "1.4.0.1"; + +#endif diff --git a/lk/target/htcleo/init.c b/lk/target/htcleo/init.c index 4c8f37c..16f4172 100644 --- a/lk/target/htcleo/init.c +++ b/lk/target/htcleo/init.c @@ -13,6 +13,8 @@ #include #include +#include "version.h" + #define LINUX_MACHTYPE 2524 #define HTCLEO_FLASH_OFFSET 0x219 @@ -148,6 +150,9 @@ void target_init(void) } void display_lk_version() { + char *version = "cedesmith's LK (CLK) v"; + strcat(version,cLK_version); + strcat(version,"\n"); _dputs("cedesmith's LK (CLK) v1.4\n"); } struct fbcon_config* fbcon_display(void);