Add Ritmix RZX-50 and RZX-27

Makefile

@@ -25,7 +25,7 @@ CFLAGS	+= $(CFLAGS_all)
 CPPFLAGS := -DBOARD_$(BOARD) -DJZ_VERSION=$(JZ_VERSION)
 LDFLAGS := -nostdlib -EL
 
-ifneq ($(findstring $(JZ_VERSION),JZ4740 JZ4750),)
+ifneq ($(findstring $(JZ_VERSION),JZ4740 JZ4750 JZ4725 JZ4755),)
 LDFLAGS += -T ldscripts/target-jz4740.ld
 endif
 
@@ -38,7 +38,7 @@ endif
 
 OUTDIR	:= output/$(CONFIG)
 
-OBJS	:= utils.o mmc.o fat.o head.o uimage.o
+OBJS	:= utils.o mmc.o fat.o uimage.o
 
 ifdef GC_FUNCTIONS
 	CFLAGS += -ffunction-sections
@@ -82,7 +82,10 @@ OBJFILES := $(addprefix $(OUTDIR)/,$(OBJS))
 all: $(BINFILES)
 
 $(ELFFILES): $(OUTDIR)/ubiboot-%.elf: \
-		$(OUTDIR)/main_%.o $(OUTDIR)/board-$(BOARD)_%.o $(OBJFILES)
+		$(OUTDIR)/main_%.o \
+		$(OUTDIR)/board-$(BOARD)_%.o \
+		$(OUTDIR)/head_%.o \
+		$(OBJFILES)
 	@mkdir -p $(@D)
 	$(SUM) "  LD      $@"
 	$(CMD)$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@
@@ -104,6 +107,13 @@ $(OUTDIR)/%.o: src/%.S
 
 CFLAGS_FOR_VARIANT=$(CFLAGS) -DVARIANT="\"$(1)\"" $(CFLAGS_$(1))
 
+$(OUTDIR)/head_%.o: src/head.S
+	@mkdir -p $(@D)
+	$(SUM) "  CC      $@"
+	$(CMD)$(CC) $(CFLAGS) $(CPPFLAGS) \
+		$(call CFLAGS_FOR_VARIANT,$(@:$(OUTDIR)/head_%.o=%)) \
+		-c $< -o $@
+
 $(OUTDIR)/board-$(BOARD)_%.o: src/board-$(BOARD).c
 	@mkdir -p $(@D)
 	$(SUM) "  CC      $@"

config-rzx27.mk

@@ -0,0 +1,18 @@
+# Ritmix RZX-27 handheld
+# - Ingenic JZ4725b
+# - 32Mb SDRAM
+# - 4Gb SD-card as main storage (might have NAND instead)
+# - 320x240 smart LCD (UC8230 based, might have another screens)
+GC_FUNCTIONS = True
+USE_SERIAL = True
+#BKLIGHT_ON = True
+#USE_NAND = False
+#USE_UBI = False
+
+BOARD := rzx27
+
+VARIANTS := mmc
+JZ_VERSION = 4725
+
+CFLAGS_all := -mips32 -DTRY_ORIGINAL_FIRMWARE
+CFLAGS_mmc := -DHAVE_MBR

config-rzx50.mk

@@ -0,0 +1,19 @@
+# Ritmix RZX-50 handheld
+# - Ingenic JZ4755
+# - 64Mb SDRAM
+# - 4Gb SD-card as main storage
+# - 480х272 LCD
+# - have 2 variants, with or without analog joystick
+GC_FUNCTIONS = True
+USE_SERIAL = True
+#BKLIGHT_ON = True
+#USE_NAND = True
+#USE_UBI = True
+
+BOARD := rzx50
+
+VARIANTS := mmc
+JZ_VERSION = 4755
+
+CFLAGS_all := -mips32 -DTRY_ORIGINAL_FIRMWARE
+CFLAGS_mmc := -DHAVE_MBR

src/board-rzx27.c

@@ -0,0 +1,299 @@
+/*
+ * board.c
+ *
+ * Board init routines.
+ *
+ * Copyright (C) 2006 Ingenic Semiconductor Inc.
+ * Maintainer Siarhei Volkau <lis8215@gmail.com>
+ *
+ */
+
+#include <stdint.h>
+
+#include "config.h"
+
+#include "board.h"
+#include "serial.h"
+#include "utils.h"
+
+#include "jz.h"
+#include "jz4740-cpm.h"
+#include "jz4740-emc.h"
+#include "jz4740-gpio.h"
+#include "mmc.h"
+
+#define CDIV 1
+#define HDIV 3
+#define PDIV 3
+#define MDIV 3
+#define LDIV 3
+
+/* PLL output clock = EXTAL * NF / (NR * NO)
+ *
+ * NF = FD + 2, NR = RD + 2
+ * NO = 1 (if OD = 0), NO = 2 (if OD = 1 or 2), NO = 4 (if OD = 3)
+ */
+static void pll_init(void)
+{
+	register unsigned int cfcr, plcr1, pllout2;
+	static const uint8_t n2FR[33] = {
+		0, 0, 1, 2, 3, 0, 4, 0, 5, 0, 0, 0, 6, 0, 0, 0,
+		7, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0,
+		9
+	};
+
+	cfcr = CPM_CPCCR_CLKOEN |
+		CPM_CPCCR_PCS |
+		((unsigned int) n2FR[CDIV] << CPM_CPCCR_CDIV_BIT) |
+		((unsigned int) n2FR[HDIV] << CPM_CPCCR_HDIV_BIT) |
+		((unsigned int) n2FR[PDIV] << CPM_CPCCR_PDIV_BIT) |
+		((unsigned int) n2FR[MDIV] << CPM_CPCCR_MDIV_BIT) |
+		((unsigned int) n2FR[LDIV] << CPM_CPCCR_LDIV_BIT);
+
+	pllout2 = (cfcr & CPM_CPCCR_PCS) ? CFG_CPU_SPEED : (CFG_CPU_SPEED / 2);
+
+	/* Init USB Host clock, pllout2 must be n*48MHz */
+	REG_CPM_UHCCDR = pllout2 / 48000000 - 1;
+
+#define NF (CFG_CPU_SPEED * 2 / CFG_EXTAL)
+	plcr1 = ((NF - 2) << CPM_CPPCR_PLLM_BIT) | /* FD */
+		(0 << CPM_CPPCR_PLLN_BIT) |	/* RD=0, NR=2 */
+		(0 << CPM_CPPCR_PLLOD_BIT) |    /* OD=0, NO=1 */
+		(0x20 << CPM_CPPCR_PLLST_BIT) | /* PLL stable time */
+		CPM_CPPCR_PLLEN;                /* enable PLL */
+
+	/* init PLL */
+	REG_CPM_CPCCR = cfcr;
+	REG_CPM_CPPCR = plcr1;
+
+	__cpm_enable_pll_change();
+	while (!__cpm_pll_is_on());
+}
+
+/*
+ * Copied from RS90 as is. However, the DRAM chip
+ * is ETRON EM63A165TS-6G and might have differences.
+ */
+#define SDRAM_CASL      3       /* CAS latency: 2 or 3 */
+#define SDRAM_TRAS      42      /* RAS# Active Time (ns) */
+#define SDRAM_RCD       18      /* RAS# to CAS# Delay (ns) */
+#define SDRAM_TPC       18      /* RAS# Precharge Time (ns) */
+#define SDRAM_TREF      15625   /* Refresh period (ns) */
+#define SDRAM_TRWL      7       /* Write Latency Time (ns) */
+#define SDRAM_BW16      1
+#define SDRAM_BANK40    0
+#define SDRAM_BANK4     1
+#define SDRAM_ROW0      11
+#define SDRAM_ROW       13
+#define SDRAM_COL0      9
+#define SDRAM_COL       9
+
+static void sdram_init(void)
+{
+	unsigned int dmcr0, dmcr, sdmode, tmp;
+
+	static const unsigned int cas_latency_sdmr[2] = {
+		EMC_SDMR_CAS_2,
+		EMC_SDMR_CAS_3,
+	};
+
+	static const unsigned int cas_latency_dmcr[2] = {
+		1 << EMC_DMCR_TCL_BIT,	/* CAS latency is 2 */
+		2 << EMC_DMCR_TCL_BIT	/* CAS latency is 3 */
+	};
+
+	REG_EMC_BCR = 0;	/* Disable bus release */
+	REG_EMC_RTCSR = 0;	/* Disable clock for counting */
+
+	/* Fault DMCR value for mode register setting*/
+	dmcr0 = ((SDRAM_ROW0-11)<<EMC_DMCR_RA_BIT) |
+		((SDRAM_COL0-8)<<EMC_DMCR_CA_BIT) |
+		(SDRAM_BANK40<<EMC_DMCR_BA_BIT) |
+		(SDRAM_BW16<<EMC_DMCR_BW_BIT) |
+		EMC_DMCR_EPIN |
+		cas_latency_dmcr[((SDRAM_CASL == 3) ? 1 : 0)];
+
+	/* Basic DMCR value */
+	dmcr = ((SDRAM_ROW-11)<<EMC_DMCR_RA_BIT) |
+		((SDRAM_COL-8)<<EMC_DMCR_CA_BIT) |
+		(SDRAM_BANK4<<EMC_DMCR_BA_BIT) |
+		(SDRAM_BW16<<EMC_DMCR_BW_BIT) |
+		EMC_DMCR_EPIN |
+		cas_latency_dmcr[((SDRAM_CASL == 3) ? 1 : 0)];
+
+	/* SDRAM timimg */
+#define NS (1000000000 / (CFG_CPU_SPEED * CDIV / MDIV))
+	tmp = SDRAM_TRAS/NS;
+	if (tmp < 4) tmp = 4;
+	if (tmp > 11) tmp = 11;
+	dmcr |= ((tmp-4) << EMC_DMCR_TRAS_BIT);
+	tmp = SDRAM_RCD/NS;
+	if (tmp > 3) tmp = 3;
+	dmcr |= (tmp << EMC_DMCR_RCD_BIT);
+	tmp = SDRAM_TPC/NS;
+	if (tmp > 7) tmp = 7;
+	dmcr |= (tmp << EMC_DMCR_TPC_BIT);
+	tmp = SDRAM_TRWL/NS;
+	if (tmp > 3) tmp = 3;
+	dmcr |= (tmp << EMC_DMCR_TRWL_BIT);
+	tmp = (SDRAM_TRAS + SDRAM_TPC)/NS;
+	if (tmp > 14) tmp = 14;
+	dmcr |= (((tmp + 1) >> 1) << EMC_DMCR_TRC_BIT);
+
+	/* SDRAM mode value */
+	sdmode = EMC_SDMR_BT_SEQ |
+		 EMC_SDMR_OM_NORMAL |
+		 EMC_SDMR_BL_4 |
+		 cas_latency_sdmr[((SDRAM_CASL == 3) ? 1 : 0)];
+
+	/* Stage 1. Precharge all banks by writing SDMR with DMCR.MRSET=0 */
+	REG_EMC_DMCR = dmcr;
+	REG8(EMC_SDMR0|sdmode) = 0;
+
+	/* Wait for precharge, > 200us */
+	udelay(1000);
+
+	/* Stage 2. Enable auto-refresh */
+	REG_EMC_DMCR = dmcr | EMC_DMCR_RFSH;
+
+	tmp = SDRAM_TREF/NS;
+	tmp = tmp/64 + 1;
+	if (tmp > 0xff) tmp = 0xff;
+	REG_EMC_RTCOR = tmp;
+	REG_EMC_RTCNT = 0;
+	REG_EMC_RTCSR = EMC_RTCSR_CKS_64;	/* Divisor is 64, CKO/64 */
+
+	/* Wait for number of auto-refresh cycles */
+	udelay(1000);
+
+ 	/* Stage 3. Mode Register Set */
+	REG_EMC_DMCR = dmcr0 | EMC_DMCR_RFSH | EMC_DMCR_MRSET;
+	REG8(EMC_SDMR0|sdmode) = 0;
+
+        /* Set back to basic DMCR value */
+	REG_EMC_DMCR = dmcr | EMC_DMCR_RFSH | EMC_DMCR_MRSET;
+
+	/* everything is ok now */
+}
+
+int alt_key_pressed(void)
+{
+	return 0; /* TODO */
+}
+
+int alt2_key_pressed(void)
+{
+	return 0; /* TODO */
+}
+
+int alt3_key_pressed(void)
+{
+	return 0; /* TODO */
+}
+
+#ifdef BKLIGHT_ON
+void light(int set)
+{
+	if (set)
+		__gpio_set_pin(GPIOC, 15);
+	else
+		__gpio_clear_pin(GPIOC, 15);
+}
+#endif
+
+unsigned int get_memory_size(void)
+{
+	return 1 << (SDRAM_ROW + SDRAM_COL + (2 - SDRAM_BW16) +
+				(2 - SDRAM_BANK4) + 1);
+}
+
+void board_init(void)
+{
+#ifdef USE_NAND
+	__gpio_as_func_mask(GPIOC, 0x36300300, 0);
+	__gpio_as_input(GPIOC, 27);
+	__gpio_disable_pull(GPIOC, 27);
+#else
+	/* MSC0 pins */
+	__gpio_as_func_mask(GPIOC, 0x30400300, 1);
+	__gpio_as_func_mask(GPIOC, 0x08000000, 0);
+#endif
+
+	/* SDRAM pins */
+	__gpio_as_func_mask(0, 0xffff, 0);
+	__gpio_as_func_mask(1, 0x033fffff, 0);
+
+	/* MSC1 pins */
+	__gpio_as_func_mask(GPIOD, 0x1c000000, 0);
+
+#ifdef USE_SERIAL
+	__gpio_as_func(2, 12, 1); /* UART_TX */
+
+	/* Start UART clock */
+	REG_CPM_CLKGR &= ~BIT(0);
+
+	serial_init();
+#endif
+
+	pll_init();
+	SERIAL_PUTS_ARGI("PLL running at ", __cpm_get_pllout() / 1000000, " MHz.\n");
+
+	sdram_init();
+	SERIAL_PUTS_ARGI("SDRAM running at ", __cpm_get_mclk() / 1000000, " MHz.\n");
+	SERIAL_PUTS_ARGI("SDRAM size is ", get_memory_size() / 1048576, " MiB.\n");
+
+#ifdef BKLIGHT_ON
+	__gpio_set_pin(GPIOC, 15);
+	__gpio_as_output(GPIOC, 15);
+#endif
+
+	/* Ungate MSC0/1 clock */
+	REG_CPM_CLKGR &= ~(BIT(6) | BIT(16));
+
+	/* Set divider for the MSC0/1 clock */
+	__cpm_set_mscdiv((__cpm_get_pllout2() / 24000000) - 1);
+}
+
+#ifdef USE_NAND
+void nand_wait_ready(void)
+{
+	unsigned int timeout = 10000;
+
+	while (__gpio_get_pin(GPIOC, 27) && timeout--);
+	while (!__gpio_get_pin(GPIOC, 27));
+}
+
+void nand_init(void)
+{
+	REG32(EMC_SMCR1) = (EMC_TAS << EMC_SMCR_TAS_BIT) |
+			   (EMC_TAH << EMC_SMCR_TAH_BIT) |
+			   (EMC_TBP << EMC_SMCR_TBP_BIT) |
+			   (EMC_TAW << EMC_SMCR_TAW_BIT) |
+			   (EMC_STRV << EMC_SMCR_STRV_BIT);
+}
+#endif
+
+void original_firmware_load(void)
+{
+	// internal MSC0 shall be initialized first
+	// original firmware is at 256kiB offset on SD card.
+	// shall be loaded at 0x00800000 offset in RAM
+
+	const uint32_t load_addr = 0x00800000;
+	// load 1MiB bytes into RAM from 512 blocks (256kiB) offset on SD card.
+	if (!mmc_block_read(0, (void *) (KSEG1 + load_addr), 512, 2048)) {
+
+		SERIAL_PUTS("Trying original RZX-27 firmware from internal SD.\n");
+
+		// TODO check that loaded data not a crap
+		// reset the LCD controller for proper reintialization
+		__gpio_clear_pin(GPIOD, 21);
+		udelay(1000);
+		__gpio_set_pin(GPIOD, 21);
+
+		// jump into firmware
+		void (*entry)(void) = (void (*)(void))(KSEG1 + load_addr);
+		entry();
+		while (1);
+	}
+}