Meizu M6 SP: make bootloader compile and run again

* don't use DRAM yet in the bootloader linker script
* add header files for the ftl and nand
* update svn:keywords


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23347 a1c6a512-1295-4272-9138-f99709370657

firmware/export/config-meizu-m6sp.h

@@ -58,6 +58,9 @@
 
 #define CONFIG_NAND NAND_SAMSUNG
 
+/* The NAND flash has 2048-byte sectors, and is our only storage */
+#define SECTOR_SIZE 2048
+
 /* LCD dimensions */
 #define LCD_WIDTH  240
 #define LCD_HEIGHT 320

firmware/target/arm/s5l8700/boot.lds

@@ -90,11 +90,13 @@ SECTIONS
      _fiqstackend = .;
   } > IRAM
 
+  . = DRAMORIG;
+#ifdef IPOD_NANO2G
   /* The bss section is too large for IRAM - we just move it 12MB into the
      DRAM */
-
+  . += (12*1024*1024) {
-  . = DRAMORIG;
+#endif
-  .bss . + (12*1024*1024): {
+  .bss :{
      _edata = .;
      *(.bss*);
      *(.ibss);
@@ -102,5 +104,9 @@ SECTIONS
      *(COMMON);
     . = ALIGN(0x4);
      _end = .;
+#ifdef IPOD_NANO2G
   } > DRAM
+#else /* other targets don't have DRAM set up yet */
+  } > IRAM
+#endif  
 }

firmware/target/arm/s5l8700/meizu-m6sp/ftl-target.h

@@ -0,0 +1,45 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2009 by Michael Sparmann
+ *
+ * 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.
+ *
+ ****************************************************************************/
+
+#ifndef __FTL_TARGET_H__
+#define __FTL_TARGET_H__
+
+#include "config.h"
+#include "inttypes.h"
+
+#ifdef BOOTLOADER
+/* Bootloaders don't need write access */
+#define FTL_READONLY
+#endif
+
+/* Pointer to an info structure regarding the flash type used */
+const struct nand_device_info_type* ftl_nand_type;
+
+/* Number of banks we detected a chip on */
+uint32_t ftl_banks;
+
+uint32_t ftl_init(void);
+uint32_t ftl_read(uint32_t sector, uint32_t count, void* buffer);
+uint32_t ftl_write(uint32_t sector, uint32_t count, const void* buffer);
+uint32_t ftl_sync(void);
+
+
+#endif

firmware/target/arm/s5l8700/meizu-m6sp/nand-target.h

@@ -0,0 +1,56 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2009 by Michael Sparmann
+ *
+ * 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.
+ *
+ ****************************************************************************/
+
+#ifndef __NAND_TARGET_H__
+#define __NAND_TARGET_H__
+
+#include "config.h"
+#include "inttypes.h"
+
+
+struct nand_device_info_type
+{
+    uint32_t id;
+    uint16_t blocks;
+    uint16_t userblocks;
+    uint16_t pagesperblock;
+	uint8_t blocksizeexponent;
+    uint8_t tunk1;
+    uint8_t twp;
+    uint8_t tunk2;
+    uint8_t tunk3;
+} __attribute__((packed));
+
+uint32_t nand_read_page(uint32_t bank, uint32_t page, void* databuffer,
+                        void* sparebuffer, uint32_t doecc,
+                        uint32_t checkempty);
+uint32_t nand_write_page(uint32_t bank, uint32_t page, void* databuffer,
+                         void* sparebuffer, uint32_t doecc);
+uint32_t nand_block_erase(uint32_t bank, uint32_t page);
+
+const struct nand_device_info_type* nand_get_device_type(uint32_t bank);
+uint32_t nand_reset(uint32_t bank);
+uint32_t nand_device_init(void);
+void nand_power_up(void);
+void nand_power_down(void);
+
+
+#endif