android/cLK
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

modified to add version.h, and ther rest of the places, to use this variable

Browse Source
This commit is contained in:
Arif Ali
2011-05-08 02:06:18 +01:00
parent d3ad9449ec
commit f5de287492
4 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lk/app/aboot/aboot.c
View File

@@ -46,10 +46,11 @@
#include "recovery.h"
#include "bootimg.h"
#include "fastboot.h"
#include "version.h"
#define EXPAND(NAME) #NAME
#define TARGET(NAME) EXPAND(NAME)
#define DEFAULT_CMDLINE "clk=1.4";
#define DEFAULT_CMDLINE "";
#ifdef MEMBASE
#define EMMC_BOOT_IMG_HEADER_ADDR (0xFF000+(MEMBASE))
@@ -289,10 +290,12 @@ unified_boot:
if(hdr->cmdline[0]) {
cmdline = (char*) hdr->cmdline;
strcat(cmdline," clk=1.4");
} else {
cmdline = DEFAULT_CMDLINE;
}
strcat(cmdline," clk=");
strcat(cmdline,cLK_version);
dprintf(INFO, "cmdline = '%s'\n", cmdline);
dprintf(INFO, "\nBooting Linux\n");
@@ -382,10 +385,12 @@ continue_boot:
if(hdr->cmdline[0]) {
cmdline = (char*) hdr->cmdline;
strcat(cmdline," clk=1.4");
} else {
cmdline = DEFAULT_CMDLINE;
}
strcat(cmdline," clk=");
strcat(cmdline,cLK_version);
dprintf(INFO, "cmdline = '%s'\n", cmdline);
/* TODO: create/pass atags to kernel */

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

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

7
lk/target/htcleo/init.c
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,7 +150,10 @@ void target_init(void)
}
void display_lk_version()
{
_dputs("cedesmith's LK (CLK) v1.4\n");
char *version = "cedesmith's LK (CLK) v";
strcat(version,cLK_version);
strcat(version,"\n");
_dputs(version);
}
struct fbcon_config* fbcon_display(void);
void htcleo_fastboot_init()

4
lk/target/htcleo/rules.mk
View File

@@ -5,9 +5,9 @@ INCLUDES += -I$(LOCAL_DIR)/include -I$(LK_TOP_DIR)/platform/msm_shared
PLATFORM := qsd8k
#define system partition size (in MB), if not defined my custom (from magldr) layout is used. see init.c
DEFINES += SYSTEM_PARTITION_SIZE=400
DEFINES += SYSTEM_PARTITION_SIZE=250
#DEFINES += SYSTEM_PARTITION_SIZE=400
DEFINES += CACHE_PARTITION_SIZE=44
DEFINES += CACHE_PARTITION_SIZE=5
#cedesmith note: MEMBASE requires edit in platform/qsd8k/rules.mk
# maximum partition size will be about 340mb ( MEMBASE-SCRATCH_ADDR)