diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2020-10-08 17:22:06 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2020-10-08 19:20:50 -0400 |
commit | dc81f96fd1bf3ddfe4c9e750ff14a0238f85d776 (patch) | |
tree | dbf25789aed73f92ba3a0adeca2daf16eafcb739 | |
parent | ff6e175c20b816ebcdbd5bd6d9a4db2cf4b4c4c1 (diff) | |
download | rockbox-dc81f96fd1bf3ddfe4c9e750ff14a0238f85d776.tar.gz rockbox-dc81f96fd1bf3ddfe4c9e750ff14a0238f85d776.zip |
Don't compile audio codecs into native bootloader builds.
Change-Id: I0b2cc143572bf88423bdf7647cee0af567aee684
-rw-r--r-- | firmware/SOURCES | 8 | ||||
-rw-r--r-- | firmware/target/hosted/agptek/rocker.make | 2 | ||||
-rw-r--r-- | firmware/target/hosted/xduoo/button-xduoo.c | 9 | ||||
-rw-r--r-- | firmware/target/hosted/xduoo/xduoo.make | 5 |
4 files changed, 16 insertions, 8 deletions
diff --git a/firmware/SOURCES b/firmware/SOURCES index a68d10ec76..1471eb7b94 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES | |||
@@ -436,7 +436,9 @@ drivers/audio/audiohw-swcodec.c | |||
436 | #endif /* BOOTLOADER */ | 436 | #endif /* BOOTLOADER */ |
437 | 437 | ||
438 | /* Audio codec */ | 438 | /* Audio codec */ |
439 | #if (CONFIG_PLATFORM & PLATFORM_NATIVE) && !defined(BOOTLOADER) | 439 | #if !defined(BOOTLOADER) |
440 | |||
441 | #if (CONFIG_PLATFORM & PLATFORM_NATIVE) | ||
440 | #if defined(HAVE_UDA1380) | 442 | #if defined(HAVE_UDA1380) |
441 | drivers/audio/uda1380.c | 443 | drivers/audio/uda1380.c |
442 | #elif defined(HAVE_WM8740) | 444 | #elif defined(HAVE_WM8740) |
@@ -506,7 +508,9 @@ target/hosted/sdl/pcm-sdl.c | |||
506 | #endif /* (CONFIG_PLATFORM & PLATFORM_MAEMO) */ | 508 | #endif /* (CONFIG_PLATFORM & PLATFORM_MAEMO) */ |
507 | 509 | ||
508 | #endif | 510 | #endif |
509 | #endif /* (CONFIG_PLATFORM & PLATFORM_NATIVE) && !defined(BOOTLOADER) */ | 511 | #endif /* (CONFIG_PLATFORM & PLATFORM_NATIVE) */ |
512 | |||
513 | #endif /* !defined(BOOTLOADER) */ | ||
510 | 514 | ||
511 | /* CPU Specific - By class then particular chip if applicable */ | 515 | /* CPU Specific - By class then particular chip if applicable */ |
512 | #if defined(CPU_COLDFIRE) | 516 | #if defined(CPU_COLDFIRE) |
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) | |||
43 | -L$(BUILDDIR)/lib $(call a2lnk,$(CORE_LIBS)) \ | 43 | -L$(BUILDDIR)/lib $(call a2lnk,$(CORE_LIBS)) \ |
44 | $(LDOPTS) $(GLOBAL_LDOPTS) -Wl,-Map,$(BUILDDIR)/rockbox.map | 44 | $(LDOPTS) $(GLOBAL_LDOPTS) -Wl,-Map,$(BUILDDIR)/rockbox.map |
45 | 45 | ||
46 | $(BUILDDIR)/rockbox.rocker : $(BUILDDIR)/rockbox.elf | 46 | $(BUILDDIR)/$(BINARY): $(BUILDDIR)/rockbox.elf |
47 | $(call PRINTS,OC $(@F))$(call objcopy,$^,$@) | 47 | $(call PRINTS,OC $(@F))$(call objcopy,$^,$@) |
48 | 48 | ||
49 | endif | 49 | 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) | |||
138 | 138 | ||
139 | bool headphones_inserted(void) | 139 | bool headphones_inserted(void) |
140 | { | 140 | { |
141 | #ifdef BOOTLOADER | ||
142 | int ps = 0; | ||
143 | #else | ||
141 | int ps = xduoo_get_outputs(); | 144 | int ps = xduoo_get_outputs(); |
145 | #endif | ||
142 | 146 | ||
143 | return (ps == 2 || ps == 3); | 147 | return (ps == 2 || ps == 3); |
144 | } | 148 | } |
145 | 149 | ||
146 | bool lineout_inserted(void) | 150 | bool lineout_inserted(void) |
147 | { | 151 | { |
152 | #ifdef BOOTLOADER | ||
153 | int ps = 0; | ||
154 | #else | ||
148 | int ps = xduoo_get_outputs(); | 155 | int ps = xduoo_get_outputs(); |
149 | 156 | #endif | |
150 | return (ps == 1); | 157 | return (ps == 1); |
151 | } | 158 | } |
152 | 159 | ||
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) | |||
43 | -L$(BUILDDIR)/lib $(call a2lnk,$(CORE_LIBS)) \ | 43 | -L$(BUILDDIR)/lib $(call a2lnk,$(CORE_LIBS)) \ |
44 | $(LDOPTS) $(GLOBAL_LDOPTS) -Wl,-Map,$(BUILDDIR)/rockbox.map | 44 | $(LDOPTS) $(GLOBAL_LDOPTS) -Wl,-Map,$(BUILDDIR)/rockbox.map |
45 | 45 | ||
46 | $(BUILDDIR)/rockbox.x3ii : $(BUILDDIR)/rockbox.elf | 46 | $(BUILDDIR)/$(BINARY): $(BUILDDIR)/rockbox.elf |
47 | $(call PRINTS,OC $(@F))$(call objcopy,$^,$@) | ||
48 | |||
49 | $(BUILDDIR)/rockbox.x20 : $(BUILDDIR)/rockbox.elf | ||
50 | $(call PRINTS,OC $(@F))$(call objcopy,$^,$@) | 47 | $(call PRINTS,OC $(@F))$(call objcopy,$^,$@) |
51 | 48 | ||
52 | endif | 49 | endif |