Add git-based versioning
Signed-off-by: Andy Green <[EMAIL PROTECTED]>
---
Makefile | 8 +++++++-
src/serial.c | 2 +-
src/start_kboot.c | 37 ++++++++++++++++++++-----------------
3 files changed, 28 insertions(+), 19 deletions(-)
diff --git a/Makefile b/Makefile
index 0cf54e3..1f2936b 100644
--- a/Makefile
+++ b/Makefile
@@ -16,10 +16,16 @@
include config.mk
+BUILD_DATE := $(shell date)
+BUILD_HOST := $(shell hostname)
+BUILD_BRANCH := $(shell git branch | grep ^\* | cut -d' ' -f2)
+BUILD_HEAD := $(shell git show --pretty=oneline | head -n1 | cut -d' ' -f1 |
cut -b1-16)
+BUILD_VERSION := ${BUILD_BRANCH}_${BUILD_HEAD}
+
LDS = src/kboot-stage1.lds
INCLUDE = include
IMAGE_DIR = image
-CFLAGS = -Wall -Werror -I $(INCLUDE) -g -c
+CFLAGS = -Wall -Werror -I $(INCLUDE) -g -c -DBUILD_HOST="${BUILD_HOST}"
-DBUILD_VERSION="${BUILD_VERSION}" -DBUILD_DATE="${BUILD_DATE}"
LDFLAGS =
#START = start.o lowlevel_init.o
S_SRCS = src/start.S src/lowlevel_init.S
diff --git a/src/serial.c b/src/serial.c
index 9c7e7f9..38053f8 100644
--- a/src/serial.c
+++ b/src/serial.c
@@ -23,7 +23,7 @@
#include "blink_led.h"
#include "kboot.h"
-#define DEBUG_CONSOLE_UART 2
+#define DEBUG_CONSOLE_UART UART2
void serial_init (const int ubrdiv_val,const int uart)
{
diff --git a/src/start_kboot.c b/src/start_kboot.c
index 76a1c34..b9777ec 100644
--- a/src/start_kboot.c
+++ b/src/start_kboot.c
@@ -36,27 +36,30 @@ unsigned char buf[]={
unsigned char buf[2*1024];
#define ADDR ((volatile unsigned *)&buf)
+#define stringify(x) #x
int start_kboot(void)
{
- port_init();
- serial_init(0x11,UART2);
- while(1){
- serial_putc (UART2,'2');
- blue_on(1);
- }
+ port_init();
+ serial_init(0x11, UART2);
- /*2. test nand flash */
- if(nand_read_ll(buf, 0x000, sizeof(buf))==-1) {
- while(1) {
- blink_led();
- }
- }
+ while(1) {
+ serial_putc(2, 'x');
+ serial_putc(2, 'x');
+ serial_putc(2, 'x');
+ printk("Openmoko KBOOT "stringify(BUILD_HOST)"
"stringify(BUILD_VERSION)" "stringify(BUILD_DATE)"\n");
+ blue_on(1);
+ }
- asm volatile("mov pc, %0\n"
- : /* output */
- :"r"(ADDR) /* input */
- );
+ /*2. test nand flash */
+ if(nand_read_ll(buf, 0x000, sizeof(buf))==-1)
+ while(1)
+ blink_led();
- return 0;
+ asm volatile("mov pc, %0\n"
+ : /* output */
+ :"r"(ADDR) /* input */
+ );
+
+ return 0;
}
