Added version.h, Makefile

Added relevent version info in the rest of the code, to reference
the variable in version.h. Makefile to be able to use make
This commit is contained in:
Arif Ali 2011-05-08 02:35:18 +01:00
parent 2e26415092
commit 98d0f46c45
4 changed files with 46 additions and 0 deletions

28
Makefile Normal file
View File

@ -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)

View File

@ -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 */

6
lk/include/version.h Normal file
View File

@ -0,0 +1,6 @@
fndef __VERSION_H
#define __VERSION_H
static const char *cLK_version = "1.4.0.1";
#endif

View File

@ -13,6 +13,8 @@
#include <platform/iomap.h>
#include <reg.h>
#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);