summaryrefslogtreecommitdiff
path: root/rbutil/mkzenboot/dualboot
diff options
context:
space:
mode:
Diffstat (limited to 'rbutil/mkzenboot/dualboot')
-rw-r--r--rbutil/mkzenboot/dualboot/Makefile3
-rw-r--r--rbutil/mkzenboot/dualboot/dualboot.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/rbutil/mkzenboot/dualboot/Makefile b/rbutil/mkzenboot/dualboot/Makefile
index cc8c604f6e..752cc3ca28 100644
--- a/rbutil/mkzenboot/dualboot/Makefile
+++ b/rbutil/mkzenboot/dualboot/Makefile
@@ -11,10 +11,11 @@ LDFLAGS=
11# 1) add x to the list in TARGETS 11# 1) add x to the list in TARGETS
12# 2) create a variable named OPT_x of the form: 12# 2) create a variable named OPT_x of the form:
13# OPT_x=target specific defines 13# OPT_x=target specific defines
14TARGETS=zenmozaic zenxfi zen 14TARGETS=zenmozaic zenxfi zen zenv
15OPT_zenmozaic=-DCREATIVE_ZENMOZAIC -DIMX233_SUBTARGET=3700 15OPT_zenmozaic=-DCREATIVE_ZENMOZAIC -DIMX233_SUBTARGET=3700
16OPT_zenxfi=-DCREATIVE_ZENXFI -DIMX233_SUBTARGET=3700 16OPT_zenxfi=-DCREATIVE_ZENXFI -DIMX233_SUBTARGET=3700
17OPT_zen=-DCREATIVE_ZEN -DIMX233_SUBTARGET=3700 17OPT_zen=-DCREATIVE_ZEN -DIMX233_SUBTARGET=3700
18OPT_zenv=-DCREATIVE_ZENV -DIMX233_SUBTARGET=3600
18 19
19BOOTLDS=$(patsubst %, dualboot_%.lds, $(TARGETS)) 20BOOTLDS=$(patsubst %, dualboot_%.lds, $(TARGETS))
20BOOTOBJS=$(patsubst %, dualboot_%.o, $(TARGETS)) 21BOOTOBJS=$(patsubst %, dualboot_%.o, $(TARGETS))
diff --git a/rbutil/mkzenboot/dualboot/dualboot.c b/rbutil/mkzenboot/dualboot/dualboot.c
index d0587fa65d..0b32772afb 100644
--- a/rbutil/mkzenboot/dualboot/dualboot.c
+++ b/rbutil/mkzenboot/dualboot/dualboot.c
@@ -21,6 +21,7 @@
21#include "regs-pinctrl.h" 21#include "regs-pinctrl.h"
22#include "regs-power.h" 22#include "regs-power.h"
23#include "regs-lradc.h" 23#include "regs-lradc.h"
24#include "regs-digctl.h"
24 25
25typedef unsigned long uint32_t; 26typedef unsigned long uint32_t;
26 27
@@ -83,7 +84,8 @@ static inline void __attribute__((noreturn)) power_down()
83 * Boot decision functions 84 * Boot decision functions
84 */ 85 */
85 86
86#if defined(CREATIVE_ZENMOZAIC) || defined(CREATIVE_ZEN) || defined(CREATIVE_ZENXFI) 87#if defined(CREATIVE_ZENMOZAIC) || defined(CREATIVE_ZEN) || defined(CREATIVE_ZENXFI) \
88 || defined(CREATIVE_ZENV)
87static enum boot_t boot_decision() 89static enum boot_t boot_decision()
88{ 90{
89 setup_lradc(0); // setup LRADC channel 0 to read keys 91 setup_lradc(0); // setup LRADC channel 0 to read keys