#include <asm/fw/myloader/myloader.h>
#include <asm/mach-ar71xx/ar71xx.h>
-#include <asm/mach-ar71xx/platform.h>
+
+#include "devices.h"
struct board_rec {
char *name;
}, {
.name = "TEW-632BRP",
.mach_type = AR71XX_MACH_TEW_632BRP,
+ }, {
+ .name = "TL-WR941ND",
+ .mach_type = AR71XX_MACH_TL_WR941ND,
}, {
.name = "UBNT-RS",
.mach_type = AR71XX_MACH_UBNT_RS,
+ }, {
+ .name = "UBNT-RSPRO",
+ .mach_type = AR71XX_MACH_UBNT_RSPRO,
+ }, {
+ .name = "Ubiquiti AR71xx-based board",
+ .mach_type = AR71XX_MACH_UBNT_RS,
+ }, {
+ .name = "UBNT-LS-SR71",
+ .mach_type = AR71XX_MACH_UBNT_LSSR71,
}, {
.name = "UBNT-LSX",
.mach_type = AR71XX_MACH_UBNT_LSX,
}
};
+static inline int is_valid_ram_addr(void *addr)
+{
+ if (((u32) addr > KSEG0) &&
+ ((u32) addr < (KSEG0 + AR71XX_MEM_SIZE_MAX)))
+ return 1;
+
+ if (((u32) addr > KSEG1) &&
+ ((u32) addr < (KSEG1 + AR71XX_MEM_SIZE_MAX)))
+ return 1;
+
+ return 0;
+}
+
static __init char *ar71xx_prom_getargv(const char *name)
{
int len = strlen(name);
int i;
- if (!ar71xx_prom_argv)
+ if (!is_valid_ram_addr(ar71xx_prom_argv))
return NULL;
for (i = 0; i < ar71xx_prom_argc; i++) {
char *argv = ar71xx_prom_argv[i];
- if (!argv)
+ if (!is_valid_ram_addr(argv))
continue;
if (strncmp(name, argv, len) == 0 && (argv)[len] == '=')
int len = strlen(envname);
char **env;
- if (!ar71xx_prom_envp)
+ if (!is_valid_ram_addr(ar71xx_prom_envp))
return NULL;
- for (env = ar71xx_prom_envp; *env != NULL; env++)
+ for (env = ar71xx_prom_envp; is_valid_ram_addr(*env); env++) {
if (strncmp(envname, *env, len) == 0 && (*env)[len] == '=')
return *env + len + 1;
+ /* RedBoot env comes in pointer pairs - key, value */
+ if (strncmp(envname, *env, len) == 0 && (*env)[len] == 0)
+ if (is_valid_ram_addr(*(++env)))
+ return *env;
+ }
+
return NULL;
}
ar71xx_prom_argv = (char **)fw_arg1;
ar71xx_prom_envp = (char **)fw_arg2;
- p = ar71xx_prom_getenv("board");
+ p = ar71xx_prom_getargv("board");
if (!p)
- p = ar71xx_prom_getargv("board");
+ p = ar71xx_prom_getenv("board");
if (p)
ar71xx_mach_type = find_board_byname(p);