From 580c1197e4eb7af8f78570607762ca212fe27415 Mon Sep 17 00:00:00 2001 From: Atsushi Nemoto Date: Tue, 19 Aug 2008 22:55:07 +0900 Subject: [PATCH] --- yaml --- r: 111095 b: refs/heads/master c: 265b89db1058124ddbf0091ba3f8c020e3a5ae9d h: refs/heads/master i: 111093: 82a9ecd7073496288ea685516d4678c9bf5c291d 111091: b62cbbb7acaa288ed7997d17b226303f12bc7d0c 111087: c943542eb8e8d09041a81cf3db5f4543a09a6b80 v: v3 --- [refs] | 2 +- trunk/arch/mips/txx9/generic/setup.c | 15 +++++++++++++++ trunk/include/asm-mips/txx9/generic.h | 1 + 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index a88f5c9ea737..b42fa397e122 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e0dfb20c2b77c6626a24578240266ace928cd2e7 +refs/heads/master: 265b89db1058124ddbf0091ba3f8c020e3a5ae9d diff --git a/trunk/arch/mips/txx9/generic/setup.c b/trunk/arch/mips/txx9/generic/setup.c index 33d8c9e3223d..005179c2af21 100644 --- a/trunk/arch/mips/txx9/generic/setup.c +++ b/trunk/arch/mips/txx9/generic/setup.c @@ -212,6 +212,21 @@ char * __init prom_getcmdline(void) return &(arcs_cmdline[0]); } +const char *__init prom_getenv(const char *name) +{ + const s32 *str = (const s32 *)fw_arg2; + + if (!str) + return NULL; + /* YAMON style ("name", "value" pairs) */ + while (str[0] && str[1]) { + if (!strcmp((const char *)(unsigned long)str[0], name)) + return (const char *)(unsigned long)str[1]; + str += 2; + } + return NULL; +} + static void __noreturn txx9_machine_halt(void) { local_irq_disable(); diff --git a/trunk/include/asm-mips/txx9/generic.h b/trunk/include/asm-mips/txx9/generic.h index c9eed7ea148c..0a225bf73496 100644 --- a/trunk/include/asm-mips/txx9/generic.h +++ b/trunk/include/asm-mips/txx9/generic.h @@ -43,6 +43,7 @@ struct txx9_board_vec { extern struct txx9_board_vec *txx9_board_vec; extern int (*txx9_irq_dispatch)(int pending); char *prom_getcmdline(void); +const char *prom_getenv(const char *name); void txx9_wdt_init(unsigned long base); void txx9_spi_init(int busid, unsigned long base, int irq); void txx9_ethaddr_init(unsigned int id, unsigned char *ethaddr);