diff options
| -rw-r--r-- | src/target/firmware/Makefile | 15 | ||||
| -rwxr-xr-x[-rw-r--r--] | src/target/firmware/board/compal_e88/init.c | 4 |
2 files changed, 13 insertions, 6 deletions
diff --git a/src/target/firmware/Makefile b/src/target/firmware/Makefile index 3af2f673..21892a42 100644 --- a/src/target/firmware/Makefile +++ b/src/target/firmware/Makefile @@ -24,12 +24,14 @@ calypso_COMMON_OBJS=board/common/calypso_uart.o board/common/calypso_pwl.o # OpenMoko GTA0x -gta0x_OBJS=$(calypso_COMMON_OBJS) board/gta0x/rffe_gta0x_triband.o board/gta0x/init.o board/gta0x/rf_power.o $(FB_dummy_OBJS) +gta0x_OBJS=$(calypso_COMMON_OBJS) board/gta0x/rffe_gta0x_triband.o board/gta0x/init.o \ + board/gta0x/rf_power.o battery/dummy.o $(FB_dummy_OBJS) gta0x_ENVIRONMENTS=highram # Pirelli DP-L10 -pirelli_dpl10_OBJS=$(calypso_COMMON_OBJS) board/pirelli_dpl10/rffe_dpl10_triband.o board/pirelli_dpl10/init.o board/pirelli_dpl10/rf_power.o $(FB_dpl10_OBJS) +pirelli_dpl10_OBJS=$(calypso_COMMON_OBJS) board/pirelli_dpl10/rffe_dpl10_triband.o board/pirelli_dpl10/init.o \ + board/pirelli_dpl10/rf_power.o battery/dummy.o $(FB_dpl10_OBJS) pirelli_dpl10_ENVIRONMENTS=highram # Compal Generic @@ -45,7 +47,7 @@ highram_OBJS=board/compal/start.ram.o board/compal/exceptions_redirected.o board # Compal E88 -compal_e88_OBJS=$(compal_COMMON_OBJS) board/compal_e88/init.o $(FB_e88_OBJS) +compal_e88_OBJS=$(compal_COMMON_OBJS) board/compal_e88/init.o battery/compal_e88.o $(FB_e88_OBJS) compal_e88_ENVIRONMENTS=$(compal_COMMON_ENVIRONMENTS) e88loader e88flash e88loader_LDS=board/compal_e88/loader.lds @@ -56,12 +58,13 @@ e88flash_OBJS=board/compal/start.rom.o board/compal/header.o board/compal/except # Compal E86 (has a different RFFE configuration) -compal_e86_OBJS=$(calypso_COMMON_OBJS) board/compal_e86/rffe_dualband_e86.o board/compal/rf_power.o board/compal_e86/init.o $(FB_e86_OBJS) +compal_e86_OBJS=$(calypso_COMMON_OBJS) board/compal_e86/rffe_dualband_e86.o board/compal/rf_power.o \ + board/compal_e86/init.o battery/dummy.o $(FB_e86_OBJS) compal_e86_ENVIRONMENTS=$(compal_COMMON_ENVIRONMENTS) # Compal E99 -compal_e99_OBJS=$(compal_COMMON_OBJS) board/compal_e99/init.o $(FB_e99_OBJS) +compal_e99_OBJS=$(compal_COMMON_OBJS) board/compal_e99/init.o battery/dummy.o $(FB_e99_OBJS) compal_e99_ENVIRONMENTS=$(compal_COMMON_ENVIRONMENTS) e99loader_LDS=board/compal_e99/loader.lds @@ -70,7 +73,7 @@ e99flash_LDS=board/compal_e99/flash.lds # Sony Ericsson J100 (made by Compal) -se_j100_OBJS=$(compal_COMMON_OBJS) board/se_j100/init.o $(FB_j100_OBJS) +se_j100_OBJS=$(compal_COMMON_OBJS) board/se_j100/init.o battery/dummy.o $(FB_j100_OBJS) se_j100_ENVIRONMENTS=$(compal_COMMON_ENVIRONMENTS) # Global include path diff --git a/src/target/firmware/board/compal_e88/init.c b/src/target/firmware/board/compal_e88/init.c index fe3fd72b..2e957311 100644..100755 --- a/src/target/firmware/board/compal_e88/init.c +++ b/src/target/firmware/board/compal_e88/init.c @@ -45,6 +45,7 @@ #include <abb/twl3025.h> #include <rf/trf6151.h> #include <fb/framebuffer.h> +#include <battery/compal_e88.h> #define ARMIO_LATCH_OUT 0xfffe4802 #define IO_CNTL_REG 0xfffe4804 @@ -133,4 +134,7 @@ void board_init(void) /* Initialize ABB driver (uses SPI) */ twl3025_init(); + + /* Initialize the charging controller */ + battery_compal_e88_init(); } |