summaryrefslogtreecommitdiffstats
path: root/firmware/target
diff options
context:
space:
mode:
authorSolomon Peachy <pizza@shaftnet.org>2020-10-08 17:22:06 -0400
committerSolomon Peachy <pizza@shaftnet.org>2020-10-08 19:20:50 -0400
commitdc81f96fd1bf3ddfe4c9e750ff14a0238f85d776 (patch)
treedbf25789aed73f92ba3a0adeca2daf16eafcb739 /firmware/target
parentff6e175c20b816ebcdbd5bd6d9a4db2cf4b4c4c1 (diff)
downloadrockbox-dc81f96fd1bf3ddfe4c9e750ff14a0238f85d776.tar.gz
rockbox-dc81f96fd1bf3ddfe4c9e750ff14a0238f85d776.tar.bz2
rockbox-dc81f96fd1bf3ddfe4c9e750ff14a0238f85d776.zip
Don't compile audio codecs into native bootloader builds.
Change-Id: I0b2cc143572bf88423bdf7647cee0af567aee684
Diffstat (limited to 'firmware/target')
-rw-r--r--firmware/target/hosted/agptek/rocker.make2
-rw-r--r--firmware/target/hosted/xduoo/button-xduoo.c9
-rw-r--r--firmware/target/hosted/xduoo/xduoo.make5
3 files changed, 10 insertions, 6 deletions
diff --git a/firmware/target/hosted/agptek/rocker.make b/firmware/target/hosted/agptek/rocker.make
index dd6be88f57..d159db77f3 100644
--- a/firmware/target/hosted/agptek/rocker.make
+++ b/firmware/target/hosted/agptek/rocker.make
@@ -43,7 +43,7 @@ $(BUILDDIR)/rockbox.elf : $$(OBJ) $(FIRMLIB) $(VOICESPEEXLIB) $(CORE_LIBS)
-L$(BUILDDIR)/lib $(call a2lnk,$(CORE_LIBS)) \
$(LDOPTS) $(GLOBAL_LDOPTS) -Wl,-Map,$(BUILDDIR)/rockbox.map
-$(BUILDDIR)/rockbox.rocker : $(BUILDDIR)/rockbox.elf
+$(BUILDDIR)/$(BINARY): $(BUILDDIR)/rockbox.elf
$(call PRINTS,OC $(@F))$(call objcopy,$^,$@)
endif
diff --git a/firmware/target/hosted/xduoo/button-xduoo.c b/firmware/target/hosted/xduoo/button-xduoo.c
index 99b0908378..503e49e001 100644
--- a/firmware/target/hosted/xduoo/button-xduoo.c
+++ b/firmware/target/hosted/xduoo/button-xduoo.c
@@ -138,15 +138,22 @@ int button_read_device(void)
bool headphones_inserted(void)
{
+#ifdef BOOTLOADER
+ int ps = 0;
+#else
int ps = xduoo_get_outputs();
+#endif
return (ps == 2 || ps == 3);
}
bool lineout_inserted(void)
{
+#ifdef BOOTLOADER
+ int ps = 0;
+#else
int ps = xduoo_get_outputs();
-
+#endif
return (ps == 1);
}
diff --git a/firmware/target/hosted/xduoo/xduoo.make b/firmware/target/hosted/xduoo/xduoo.make
index 5c37d27412..d159db77f3 100644
--- a/firmware/target/hosted/xduoo/xduoo.make
+++ b/firmware/target/hosted/xduoo/xduoo.make
@@ -43,10 +43,7 @@ $(BUILDDIR)/rockbox.elf : $$(OBJ) $(FIRMLIB) $(VOICESPEEXLIB) $(CORE_LIBS)
-L$(BUILDDIR)/lib $(call a2lnk,$(CORE_LIBS)) \
$(LDOPTS) $(GLOBAL_LDOPTS) -Wl,-Map,$(BUILDDIR)/rockbox.map
-$(BUILDDIR)/rockbox.x3ii : $(BUILDDIR)/rockbox.elf
- $(call PRINTS,OC $(@F))$(call objcopy,$^,$@)
-
-$(BUILDDIR)/rockbox.x20 : $(BUILDDIR)/rockbox.elf
+$(BUILDDIR)/$(BINARY): $(BUILDDIR)/rockbox.elf
$(call PRINTS,OC $(@F))$(call objcopy,$^,$@)
endif