diff options
Diffstat (limited to 'firmware')
| -rw-r--r-- | firmware/export/config-ondavx747.h | 18 | ||||
| -rw-r--r-- | firmware/export/config-ondavx747p.h | 170 | ||||
| -rw-r--r-- | firmware/export/config.h | 4 | ||||
| -rw-r--r-- | firmware/target/mips/ingenic_jz47xx/ata-nand-jz4740.c | 14 | ||||
| -rw-r--r-- | firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c | 10 |
5 files changed, 36 insertions, 180 deletions
diff --git a/firmware/export/config-ondavx747.h b/firmware/export/config-ondavx747.h index 117973ed56..491dab4f60 100644 --- a/firmware/export/config-ondavx747.h +++ b/firmware/export/config-ondavx747.h @@ -20,18 +20,20 @@ ****************************************************************************/ /* - * This config file is for the Onda VX747 + * This config file is for the Onda VX747(+) */ #define TARGET_TREE /* this target is using the target tree system */ #define CONFIG_SDRAM_START 0x80004000 -#define ONDA_VX747 1 - +#ifdef ONDA_VX747P +#define MODEL_NAME "Onda VX747+" +#define MODEL_NUMBER 44 +/* Define something for camera interface... */ +#else #define MODEL_NAME "Onda VX747" - -/* For Rolo and boot loader */ #define MODEL_NUMBER 45 +#endif //#define HAVE_ATA_SD //#define HAVE_HOTSWAP @@ -41,7 +43,7 @@ #define CONFIG_NAND NAND_CC -#define HAVE_MULTIVOLUME +//#define HAVE_MULTIVOLUME /* define this if you have a bitmap LCD display */ #define HAVE_LCD_BITMAP @@ -164,7 +166,11 @@ /* #define HAVE_ADJUSTABLE_CPU_FREQ */ #define CPUFREQ_NORMAL 336000000 /* CPU clock: 336 MHz */ +#ifdef ONDA_VX747P +#define BOOTFILE_EXT "vx747p" +#else #define BOOTFILE_EXT "vx747" +#endif #define BOOTFILE "rockbox." BOOTFILE_EXT #define BOOTDIR "/.rockbox" diff --git a/firmware/export/config-ondavx747p.h b/firmware/export/config-ondavx747p.h deleted file mode 100644 index bb16a6a53f..0000000000 --- a/firmware/export/config-ondavx747p.h +++ /dev/null @@ -1,170 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2008 by Olivier Barbut - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ - -/* - * This config file is for the Onda VX747+ - */ -#define TARGET_TREE /* this target is using the target tree system */ - -#define CONFIG_SDRAM_START 0x80004000 - -#define ONDA_VX747P 1 - -#define MODEL_NAME "Onda VX747+" - -/* For Rolo and boot loader */ -#define MODEL_NUMBER 44 - -//#define HAVE_ATA_SD -//#define HAVE_HOTSWAP - -//#define CONFIG_STORAGE (STORAGE_NAND | STORAGE_SD) -#define CONFIG_STORAGE STORAGE_RAMDISK /* Multivolume currently handled at firmware/target/ level */ - -#define CONFIG_NAND NAND_CC - -#define HAVE_MULTIVOLUME - -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP - -/* define this if you have a colour LCD */ -#define HAVE_LCD_COLOR - -/* define this if you have access to the quickscreen */ -#define HAVE_QUICKSCREEN - -/* define this if you have access to the pitchscreen */ -#define HAVE_PITCHSCREEN - -/* define this if you would like tagcache to build on this target */ -#define HAVE_TAGCACHE - -/* define this if the target has volume keys which can be used in the lists */ -#define HAVE_VOLUME_IN_LIST - -/* LCD dimensions */ -#define CONFIG_LCD LCD_ONDAVX747 - -#define LCD_WIDTH 240 -#define LCD_HEIGHT 400 - -#define LCD_DEPTH 16 /* 16bit colours */ -#define LCD_PIXELFORMAT RGB565 /* rgb565 */ - -/* Define this if your LCD can be enabled/disabled */ -#define HAVE_LCD_ENABLE - -#define CONFIG_KEYPAD ONDAVX747_PAD -#define HAVE_TOUCHSCREEN -#define HAVE_BUTTON_DATA - -/* Define this if you do software codec */ -#define CONFIG_CODEC SWCODEC - -/* define this if you have a real-time clock */ -#define CONFIG_RTC RTC_JZ47XX - -/* Define this for LCD backlight available */ -#define HAVE_BACKLIGHT - -#define HAVE_BACKLIGHT_BRIGHTNESS - -/* Main LCD backlight brightness range and defaults */ -#define MIN_BRIGHTNESS_SETTING 100 -#define MAX_BRIGHTNESS_SETTING 300 -#define DEFAULT_BRIGHTNESS_SETTING 300 /* "full brightness" */ -#define DEFAULT_DIMNESS_SETTING 100 /* "most dim" */ - -/* Define this if you have a software controlled poweroff */ -//#define HAVE_SW_POWEROFF - -/* The number of bytes reserved for loadable codecs */ -#define CODEC_SIZE 0x100000 - -/* The number of bytes reserved for loadable plugins */ -#define PLUGIN_BUFFER_SIZE 0x100000 - -/* Define this if you have the */ -//#define HAVE_INGENIC_CODEC - -#define CONFIG_I2C I2C_JZ47XX - -/* TLV320 has no tone controls, so we use the software ones */ -//#define HAVE_SW_TONE_CONTROLS - -/*#define HW_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | \ - SAMPR_CAP_11)*/ - -#define BATTERY_CAPACITY_DEFAULT 1250 /* default battery capacity */ -#define BATTERY_CAPACITY_MIN 500 /* min. capacity selectable */ -#define BATTERY_CAPACITY_MAX 2500 /* max. capacity selectable */ -#define BATTERY_CAPACITY_INC 100 /* capacity increment */ -#define BATTERY_TYPES_COUNT 1 /* only one type */ - -/* Hardware controlled charging with monitoring */ -//#define CONFIG_CHARGING CHARGING_MONITOR - -#ifndef SIMULATOR - -/* Define this if you have a Ingenic JZ4732 */ -#define CONFIG_CPU JZ4732 - -/* define this if the hardware can be powered off while charging */ -#define HAVE_POWEROFF_WHILE_CHARGING - -/* Define this to the CPU frequency */ -#define CPU_FREQ 336000000 /* CPU clock: 336 MHz */ -#define CFG_EXTAL 12000000 /* EXT clock: 12 Mhz */ - -/* define this if you have a flash memory storage */ -#define HAVE_FLASH_STORAGE - -/* Virtual LED (icon) */ -#define CONFIG_LED LED_VIRTUAL - -/* define this if the backlight can be set to a brightness */ -#define __BACKLIGHT_INIT - -/* Offset ( in the firmware file's header ) to the file CRC */ -#define FIRMWARE_OFFSET_FILE_CRC 0 - -/* Offset ( in the firmware file's header ) to the real data */ -#define FIRMWARE_OFFSET_FILE_DATA 8 - -/* Define this if you have adjustable CPU frequency */ -/* #define HAVE_ADJUSTABLE_CPU_FREQ */ - -#define BOOTFILE_EXT "vx747p" -#define BOOTFILE "rockbox." BOOTFILE_EXT -#define BOOTDIR "/.rockbox" - -#define CONFIG_USBOTG USBOTG_JZ4740 -#define HAVE_USBSTACK -#define USB_VENDOR_ID 0x07C4 -#define USB_PRODUCT_ID 0xA4A5 -#define USB_NUM_ENDPOINTS 3 -/* This needs to be 2048 byte aligned, but USB_QHARRAY_ATTR should take care - * of that */ -#define USB_QHARRAY_ATTR __attribute__((section(".qharray"),nocommon,aligned(4))) -#define USB_DEVBSS_ATTR IBSS_ATTR - -#endif diff --git a/firmware/export/config.h b/firmware/export/config.h index 55d5ffd06f..7680a9f9da 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h @@ -342,10 +342,8 @@ #include "config-meizu-m6sp.h" #elif defined(MEIZU_M3) #include "config-meizu-m3.h" -#elif defined(ONDA_VX747) +#elif defined(ONDA_VX747) || defined(ONDA_VX747P) #include "config-ondavx747.h" -#elif defined(ONDA_VX747P) -#include "config-ondavx747p.h" #elif defined(ONDA_VX767) #include "config-ondavx767.h" #elif defined(SANSA_CLIP) diff --git a/firmware/target/mips/ingenic_jz47xx/ata-nand-jz4740.c b/firmware/target/mips/ingenic_jz47xx/ata-nand-jz4740.c index 57361370dc..d9189280e8 100644 --- a/firmware/target/mips/ingenic_jz47xx/ata-nand-jz4740.c +++ b/firmware/target/mips/ingenic_jz47xx/ata-nand-jz4740.c @@ -345,7 +345,10 @@ static int jz_nand_read_page(unsigned long page_addr, unsigned char *dst) struct nand_param *nandp = &internal_param; int page_size, oob_size, page_per_block; int row_cycle, bus_width, ecc_count; - int i, j; + int i; +#ifdef USE_ECC + int j; +#endif unsigned char *data_buf; unsigned char oob_buf[nandp->oob_size]; @@ -629,6 +632,9 @@ static inline int read_sector(unsigned long start, unsigned int count, int nand_read_sectors(IF_MV2(int drive,) unsigned long start, int count, void* buf) { +#ifdef HAVE_MULTIVOLUME + (void)drive; +#endif int ret = 0; unsigned int i, _count, chip_size = chip_info->page_size; unsigned long _start; @@ -672,6 +678,10 @@ int nand_write_sectors(IF_MV2(int drive,) unsigned long start, int count, const (void)start; (void)count; (void)buf; +#ifdef HAVE_MULTIVOLUME + (void)drive; +#endif + return -1; } @@ -712,7 +722,9 @@ void nand_enable(bool on) #ifdef STORAGE_GET_INFO void nand_get_info(IF_MV2(int drive,) struct storage_info *info) { +#ifdef HAVE_MULTIVOLUME (void)drive; +#endif /* firmware version */ info->revision="0.00"; diff --git a/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c b/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c index 5d670a8291..6ee18a47d6 100644 --- a/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c +++ b/firmware/target/mips/ingenic_jz47xx/ata-sd-jz4740.c @@ -1697,7 +1697,9 @@ tCardInfo* card_get_info_target(int card_no) int sd_read_sectors(IF_MV2(int drive,) unsigned long start, int count, void* buf) { +#ifdef HAVE_MULTIVOLUME (void)drive; +#endif struct mmc_request request; struct mmc_response_r1 r1; int retval; @@ -1741,7 +1743,9 @@ int sd_read_sectors(IF_MV2(int drive,) unsigned long start, int count, void* buf int sd_write_sectors(IF_MV2(int drive,) unsigned long start, int count, const void* buf) { +#ifdef HAVE_MULTIVOLUME (void)drive; +#endif struct mmc_request request; struct mmc_response_r1 r1; int retval; @@ -1802,7 +1806,9 @@ void sd_spindown(int seconds) #ifdef HAVE_HOTSWAP bool sd_removable(IF_MV_NONVOID(int drive)) { +#ifdef HAVE_MULTIVOLUME (void)drive; +#endif //return true; return false; } @@ -1810,14 +1816,18 @@ bool sd_removable(IF_MV_NONVOID(int drive)) bool sd_present(IF_MV_NONVOID(int drive)) { +#ifdef HAVE_MULTIVOLUME (void)drive; +#endif return (mmcinfo.block_num > 0 && card_detect_target()); } #ifdef STORAGE_GET_INFO void sd_get_info(IF_MV2(int drive,) struct storage_info *info) { +#ifdef HAVE_MULTIVOLUME (void)drive; +#endif /* firmware version */ info->revision="0.00"; |