[PATCH 4/4] ARM: support for CPO Science DataCollector II
Darren Garnier
dgarnier at reinrag.net
Tue Sep 3 11:06:24 EDT 2013
Hi Jean-Christophe,
Thanks for your careful critique, my comments follow yours.
On Sep 3, 2013, at 7:38 AM, Jean-Christophe PLAGNIOL-VILLARD <plagnioj at jcrosoft.com> wrote:
> On 22:22 Mon 02 Sep , Darren Garnier wrote:
>> Signed-off-by: Darren Garnier <dgarnier at reinrag.net>
>> ---
>> arch/arm/boards/Makefile | 1 +
>> arch/arm/boards/cpodc2/Makefile | 4 +
>> arch/arm/boards/cpodc2/env/boot/dataflash | 10 +
>> arch/arm/boards/cpodc2/env/boot/net-usb | 22 ++
>> arch/arm/boards/cpodc2/env/config-board | 6 +
>> arch/arm/boards/cpodc2/env/dfu.png | Bin 0 -> 1669 bytes
>> arch/arm/boards/cpodc2/env/init/automount | 12 +
>> arch/arm/boards/cpodc2/env/init/msp430 | 10 +
>> arch/arm/boards/cpodc2/env/init/mtdparts | 19 ++
>> arch/arm/boards/cpodc2/env/init/splash | 8 +
>> arch/arm/boards/cpodc2/env/init/usb | 55 ++++
>> arch/arm/boards/cpodc2/env/splash.png | Bin 0 -> 1356 bytes
>> arch/arm/boards/cpodc2/env/usb.png | Bin 0 -> 339 bytes
>
> IIRC Sascha reject the splash for the atmel boards
>
> so I doubt it will accept here
I suspected that. No problem. I'll remove when I re-submit.
>> diff --git a/arch/arm/boards/cpodc2/env/init/automount b/arch/arm/boards/cpodc2/env/init/automount
>> new file mode 100755
>> index 0000000..3227619
>> --- /dev/null
>> +++ b/arch/arm/boards/cpodc2/env/init/automount
>> @@ -0,0 +1,12 @@
>> +#!/bin/sh
>> +
>> +if [ "$1" = menu ]; then
>> + init-menu-add-entry "$0" "Automountpoints"
>> + exit
>> +fi
>> +
>> +mkdir -p /mnt/tftp
>> +automount /mnt/tftp 'ifup eth0 && mount -t tftp $eth0.serverip /mnt/tftp'
>> +
>> +mkdir -p /mnt/fat
>> +automount -d /mnt/fat 'usb && [ -e /dev/disk0.0 ] && mount /dev/disk0.0 /mnt/fat'
>> diff --git a/arch/arm/boards/cpodc2/env/init/msp430 b/arch/arm/boards/cpodc2/env/init/msp430
>> new file mode 100644
>> index 0000000..0639313
>> --- /dev/null
>> +++ b/arch/arm/boards/cpodc2/env/init/msp430
>> @@ -0,0 +1,10 @@
>> +#!/bin/sh
>> +# reset it if it needs it
>> +msp430 -r
>> +# wait a moment for it to recover
>> +msleep 500
>> +
>> +msp430 -i -M msp_fw_major -m msp_fw_minor -S msp_serial -T msp_boardtype
>> +
>> +msp430 -b on
>> +
>> diff --git a/arch/arm/boards/cpodc2/env/init/mtdparts b/arch/arm/boards/cpodc2/env/init/mtdparts
>> new file mode 100755
>> index 0000000..81c18b4
>> --- /dev/null
>> +++ b/arch/arm/boards/cpodc2/env/init/mtdparts
>> @@ -0,0 +1,19 @@
>> +#!/bin/sh
>> +
>> +if [ "$1" = menu ]; then
>> + init-menu-add-entry "$0" "MTD Partitions"
>> + exit
>> +fi
>> +
>> +mtdparts="0x4200(dataflash0.bootstrap),0x4200(dataflash0.bareboxenv),0x39C00(dataflash0.barebox),0x1BE000(dataflash0.kernel)"
>> +mtdparts-add -d dataflash0 -p ${mtdparts}
>> +
>> +# mtdparts broken for - partitions
>> +mtdparts="256M(nand0.root)"
>> +kernelname="atmel_nand"
>> +# we don't really need this unless doing dfu...
>> +#mtdparts-add -b -d nand0 -p ${mtdparts} -k ${kernelname}
>> +
>> +mtdparts="-(nand0.root)"
>> +global linux.mtdparts.nand0
>> +global.linux.mtdparts.nand0="${kernelname}:${mtdparts}"
>> diff --git a/arch/arm/boards/cpodc2/env/init/splash b/arch/arm/boards/cpodc2/env/init/splash
>> new file mode 100755
>> index 0000000..18e74df
>> --- /dev/null
>> +++ b/arch/arm/boards/cpodc2/env/init/splash
>> @@ -0,0 +1,8 @@
>> +#!/bin/sh
>> +
>> +splash=/env/splash.png
>> +
>> +if [ -f ${splash} -a -e /dev/fb0 ]; then
>> + splash -o ${splash}
>> + fb0.enable=1
>> +fi
>> diff --git a/arch/arm/boards/cpodc2/env/init/usb b/arch/arm/boards/cpodc2/env/init/usb
>> new file mode 100755
>> index 0000000..ca7f017
>> --- /dev/null
>> +++ b/arch/arm/boards/cpodc2/env/init/usb
>> @@ -0,0 +1,55 @@
>> +#!/bin/sh
>> +
>> +pre_wait=2
>> +post_wait=3
>> +polarity=1
>> +
>> +dfu_config="/dev/dataflash0.bootstrap(bootstrap)sr,/dev/dataflash0.bareboxenv(bareboxenv)sr,/dev/dataflash0.barebox(barebox)sr,/dev/dataflash0.kernel(kernel)sr,/dev/nand0.root.bb(root)r"
>> +
>> +echo
>> +
>> +if [ $at91_udc0.vbus != 1 ]; then
>> + echo "No USB Device cable plugged, normal boot"
>> + exit
>> +fi
>> +
>> +splash=/env/usb.png
>> +if [ -f ${splash} -a -e /dev/fb0 ]; then
>> + splash -y 20 -x 280 ${splash}
>> + fb0.enable=1
>> +fi
>> +
>> +timeout -s -a ${pre_wait}
>> +
>> +gpio_get_value ${dfu_button}
>> +if [ $? = ${polarity} ]; then
>> + echo "dfu_button detected wait ${post_wait}s"
>> + timeout -s -a ${post_wait}
>> +
>> + if [ $at91_udc0.vbus != 1 ]; then
>> + echo "No USB Device cable plugged, normal boot"
>> + exit
>> + fi
>> +
>> + gpio_get_value ${dfu_button}
>> + if [ $? = ${polarity} ]; then
>> + echo "Start DFU Mode"
>> + splash=/env/dfu.png
>> + if [ -f ${splash} -a -e /dev/fb0 ]; then
>> + splash -o -b 0 ${splash}
>> + fi
>> + # mount mtd for dfu writing...
>> + mtdparts="256M(nand0.root)"
>> + mtdparts-add -b -d nand0 -p ${mtdparts}
> really?
>
> use init script for this
ack.
My reasoning here was not to mount the nand0 unless we were doing dfu. Now that you point it out,
I see the error in my reasoning.. the time consuming part of the NAND is in the initial device driver load,
not in adding the partition table.
>> +
>> + #Use NetChip's donated numbers
>> + dfu ${dfu_config} -P 0xFFFF -V 0x0525 -m "CPO Science" -p "DataCollector (DFU mode)"
>> + #if the dfu works.. we want to reboot
>> + reset
>> + #exit
>> + fi
>> +fi
>> +
>>
>> +static struct atmel_nand_data nand_pdata = {
>> + .ale = 22,
>> + .cle = 21,
>> + .det_pin = -EINVAL,
>> + .rdy_pin = AT91_PIN_PC15,
>> + .enable_pin = AT91_PIN_PC14,
>> +#if defined(CONFIG_MTD_NAND_ATMEL_BUSWIDTH_16)
>> + .bus_width_16 = 1,
>> +#else
>> + .bus_width_16 = 0,
>> +#endif
> do you really have 2 type of nand on the hw?
Actually, I don't. I'll remove.
>>
>> +/*
>> + * USB OHCI Host port
>> + */
>> +#ifdef CONFIG_USB_OHCI_AT91
>> +static struct at91_usbh_data __initdata usbh_data = {
>> + .ports = 1,
>> + //.vbus_pin = { AT91_PIN_PD0, -EINVAL },
> no put -EINVAL to all otherwise you request gpio 0
oh.. I understand now. Thanks.
>> +};
>> +
>> +static void __init dc_add_device_usbh(void)
>> +{
>> + if (cpu_is_at91sam9g10()) // add it just for boards with 9g10
> no c++ comment and on 9g45 you can use ehci to speed up
Alas.. My board doesn't have the 9g45. Just the 9261 and 9g10.
>> + at91_add_device_usbh_ohci(&usbh_data);
>> +}
>> +#else
>> +static void __init dc_add_device_usbh(void) {}
>> +#endif
>> +
>> +
>> +#if defined(CONFIG_USB_GADGET_DRIVER_AT91)
>> +/*
>> + * USB Device port
>> + */
>> +static struct at91_udc_data __initdata dc_udc_data = {
>> + .vbus_pin = AT91_PIN_PB29,
>> + .pullup_pin = 0,
>> +};
>> +
>> +static void dc_add_device_udc(void)
>> +{
>> + at91_add_device_udc(&dc_udc_data);
> this will not work on 9g45
Right.. and it doesn't work well on the 9g10 either. You can't compile the OHCI driver with CONFIG_MMU, and
without MMU, other things don't work well. I haven't figured it out yet, but without MMU, my DFU support will fail and
corrupt the dataflash.
I might be the only one who needs the OHCI + MMU fixed. I might work on it, but I'd like to know why you through up
your hands on it before.
>> +
>> +static int __init main_clock(void)
>> +{
>> + int tmp;
>> + static int main_clock = 0;
>> +
>> + // this works for both boards, but only if at91boostrap was used first to setup the PLL lock.
>> + if (!main_clock) {
>> + do { // wait for PLL lock..
>> + tmp = at91_pmc_read(AT91_CKGR_MCFR);
>> + } while (!(tmp & AT91_PMC_MAINRDY));
>> + tmp = (tmp & AT91_PMC_MAINF) * (AT91_SLOW_CLOCK / 16);
>> + main_clock = (tmp > 19500000) ? 20000000 : 18432000;
>> + }
>> +
>> + return main_clock;
>> +}
>
> ??? what is that?
OK... this relates to some other comments later of course. What you see is a slight variation of
what would happen if you put 0 in for at91_set_main_clock. The problem is I can't just put in a single value.
Unfortunately, I have boards now with both 18.432 MHz and 20.000 MHz.
I read the comment in the kernel code about the frequency detect not being quite reliable, and I
thought maybe the issue was that it would be off a few hertz from the correct value. So, since I have
only 2 clocks to support, I just split it down the middle and lock onto one of the correct values.
Its in a subroutine because I wasn't aware of clk_get api... that will be fixed.
>> +
>> +static int cpodc2_devices_init(void)
>> +{
>> + u32 board_revision = 0;
>> +
>> + dc_add_device_spi();
>> + dc_add_device_nand();
>> + dc_add_device_udc();
>> + dc_add_device_usbh();
>> + dc_add_device_buttons();
>> + dc_add_device_lcdc();
>> +
>> + if (! IS_ENABLED(CONFIG_MTD_DATAFLASH)) {
>> + if (IS_ENABLED(CONFIG_AT91_LOAD_BAREBOX_SRAM)) {
>> + devfs_add_partition("nand0", 0, SZ_256K + SZ_128K, DEVFS_PARTITION_FIXED, "self_raw");
>> + export_env_ull("borebox_first_stage", 1);
> why this
This is copied this section from the at91sam9261-ek of course, but really I wanted an option to start using the boards without dataflash.
Occasionally there are supply constraints on the part and so we are considering dropping the part entirely. Of course, I haven't really tested
this functionality yet and my init scripts are not cognizant of the possibility, so I suppose I should just drop it for now and resubmit
NAND only support when it is done.
>> + } else {
>> + devfs_add_partition("nand0", 0x00000, SZ_128K, DEVFS_PARTITION_FIXED, "bootstrap_raw");
>> + dev_add_bb_dev("bootstrap_raw","bootstrap");
>> + devfs_add_partition("nand0", SZ_128K, SZ_256K, DEVFS_PARTITION_FIXED, "self_raw");
>> + }
>> + dev_add_bb_dev("self_raw", "self0");
>> + devfs_add_partition("nand0", SZ_256K + SZ_128K, SZ_128K, DEVFS_PARTITION_FIXED, "env_raw");
>> + dev_add_bb_dev("env_raw", "env0");
>> + devfs_add_partition("nand0", SZ_512K, SZ_128K, DEVFS_PARTITION_FIXED, "env_raw1");
>> + dev_add_bb_dev("env_raw1", "env1");
>> + } else { // dataflash partitions
>> + devfs_add_partition("dataflash0", 0x00000, 0x4200, DEVFS_PARTITION_FIXED, "bootstrap");
>> + devfs_add_partition("dataflash0", 0x04200, 0x4200, DEVFS_PARTITION_FIXED, "env0");
>> + devfs_add_partition("dataflash0", 0x08400, 0x39C00, DEVFS_PARTITION_FIXED, "self0");
>> + }
>> +
>> + // we should probably also get revision data from the msp430
>> + // but it takes a while to load...
>> + // just fix based on whether CPU is 9g10
>> +
>> + if (nand_pdata.bus_width_16)
>> + board_revision |= (1<<31);
>> +
>> + if (cpu_is_at91sam9g10())
>> + board_revision |= (0x01<<8);
>> +
>> + if (main_clock() > 19500000)
>> + board_revision |= (0x01<<10);
> nack request the clk via clk_get
ack.
>> +
>> + armlinux_set_revision(board_revision);
>> + armlinux_set_bootparams((void *)(AT91_CHIPSELECT_1 + 0x100));
>> + armlinux_set_architecture(MACH_TYPE_CPODC2);
>> +
>> + return 0;
>> +}
>> +device_initcall(cpodc2_devices_init);
>> +
>> +static int cpodc2_console_init(void)
>> +{
>> + barebox_set_model("CPO Science DataCollector II");
>> + barebox_set_hostname("cpodc2");
>> +
>> + at91_register_uart(0, 0);
>> +#ifdef CONFIG_CPODC2_MSP430
>> + at91_register_uart(1, 0);
>> + // deactivate console and use it for the msp command
>> + cpodc2_msp430_init_console("atmel_usart1");
>> +#endif
>> + return 0;
>> +}
>> +console_initcall(cpodc2_console_init);
>> +
>> +static int cpodc2_main_clock(void)
>> +{
>> + // bootloader should have set the frequency:
>> + at91_set_main_clock(main_clock());
>
> this should be the case so just put 0 but we prefer on at91 to set it
> manually as the IP is not 100% for main clock detection
See above.
>> +
>> + return 0;
>> +}
>> +pure_initcall(cpodc2_main_clock);
>> +
>> diff --git a/arch/arm/boards/cpodc2/lowlevel_init.c b/arch/arm/boards/cpodc2/lowlevel_init.c
>> new file mode 100644
>> index 0000000..0565841
>> --- /dev/null
>> +++ b/arch/arm/boards/cpodc2/lowlevel_init.c
>> @@ -0,0 +1,108 @@
>> +/*
>> + * Copyright (C) 2009-2011 Jean-Christophe PLAGNIOL-VILLARD <plagnioj at jcrosoft.com>
>> + *
>> + * Under GPLv2
>> + */
>> +
>> +#include <common.h>
>> +#include <init.h>
>> +#include <mach/hardware.h>
>> +#include <mach/at91_rstc.h>
>> +#include <mach/at91_wdt.h>
>> +#include <mach/at91_pmc.h>
>> +#include <mach/at91sam9_smc.h>
>> +#include <mach/at91sam9_sdramc.h>
>> +#include <mach/at91sam9_matrix.h>
>> +#include <mach/at91_lowlevel_init.h>
>> +
>> +#define MASTER_CLOCK 200
>> +
>> +#if MASTER_CLOCK == 200
>> +#define MASTER_PLL_MUL 162
>> +#define MASTER_PLL_DIV 15
>> +#elif MASTER_CLOCK == 239
>> +#define MASTER_PLL_MUL 13
>> +#define MASTER_PLL_DIV 1
>> +#endif
>> +
>> +void __bare_init at91sam926x_lowlevel_board_config(struct at91sam926x_lowlevel_cfg *cfg)
>> +{
>> + /* Disable Watchdog */
>> + cfg->wdt_mr =
>> + AT91_WDT_WDIDLEHLT | AT91_WDT_WDDBGHLT |
>> + AT91_WDT_WDV |
>> + AT91_WDT_WDDIS |
>> + AT91_WDT_WDD;
>> +
>> + /* define PDC[31:16] as DATA[31:16] */
>> + cfg->ebi_pio_pdr = 0xFFFF0000;
>> + /* no pull-up for D[31:16] */
>> + cfg->ebi_pio_ppudr = 0xFFFF0000;
>> + /* EBI0_CSA, CS1 SDRAM, CS3 NAND Flash, 3.3V memories */
>> + cfg->ebi_csa =
>> + AT91_MATRIX_DBPUC | AT91_MATRIX_CS1A_SDRAMC;
>> +
>> + cfg->smc_cs = 3;
>> + cfg->smc_mode =
>> + AT91_SMC_READMODE | AT91_SMC_WRITEMODE |
>> + AT91_SMC_DBW_8 |
>> + AT91_SMC_EXNWMODE_DISABLE |
>> + AT91_SMC_TDF_(2);
>> + cfg->smc_cycle =
>> + AT91_SMC_NWECYCLE_(5) | AT91_SMC_NRDCYCLE_(5);
>> + cfg->smc_pulse =
>> + AT91_SMC_NWEPULSE_(3) | AT91_SMC_NCS_WRPULSE_(3) |
>> + AT91_SMC_NRDPULSE_(3) | AT91_SMC_NCS_RDPULSE_(3);
>> + cfg->smc_setup =
>> + AT91_SMC_NWESETUP_(1) | AT91_SMC_NCS_WRSETUP_(0) |
>> + AT91_SMC_NRDSETUP_(1) | AT91_SMC_NCS_RDSETUP_(0);
>> +
>> + cfg->pmc_mor =
>> + AT91_PMC_MOSCEN |
>> + (255 << 8); /* Main Oscillator Start-up Time */
>> + cfg->pmc_pllar =
>> + AT91_PMC_PLLA_WR_ERRATA | /* Bit 29 must be 1 when prog */
>> + AT91_PMC_OUT |
>> + ((MASTER_PLL_MUL - 1) << 16) | (MASTER_PLL_DIV);
>> + /* PCK/2 = MCK Master Clock from PLLA */
>> + cfg->pmc_mckr1 =
>> + AT91_PMC_CSS_SLOW |
>> + AT91_PMC_PRES_1 |
>> + AT91SAM9_PMC_MDIV_2 |
>> + AT91_PMC_PDIV_1;
>> + /* PCK/2 = MCK Master Clock from PLLA */
>> + cfg->pmc_mckr2 =
>> + AT91_PMC_CSS_PLLA |
>> + AT91_PMC_PRES_1 |
>> + AT91SAM9_PMC_MDIV_2 |
>> + AT91_PMC_PDIV_1;
>> +
>> + /* SDRAM */
>> + /* SDRAMC_TR - Refresh Timer register */
>> + cfg->sdrc_tr1 = 0x13C;
>> + /* SDRAMC_CR - Configuration register*/
>> + cfg->sdrc_cr =
>> + AT91_SDRAMC_NC_9 |
>> + AT91_SDRAMC_NR_13 |
>> + AT91_SDRAMC_NB_4 |
>> + AT91_SDRAMC_CAS_2 |
>> + AT91_SDRAMC_DBW_32 |
>> + (2 << 8) | /* Write Recovery Delay */
>> + (7 << 12) | /* Row Cycle Delay */
>> + (2 << 16) | /* Row Precharge Delay */
>> + (2 << 20) | /* Row to Column Delay */
>> + (5 << 24) | /* Active to Precharge Delay */
>> + (8 << 28); /* Exit Self Refresh to Active Delay */
>> +
>> + /* Memory Device Register -> SDRAM */
>> + cfg->sdrc_mdr = AT91_SDRAMC_MD_SDRAM;
>> + /* SDRAM_TR */
>> + cfg->sdrc_tr2 = (MASTER_CLOCK * 7);
>> +
>> + /* user reset enable */
>> + cfg->rstc_rmr =
>> + AT91_RSTC_KEY |
>> + AT91_RSTC_PROCRST |
>> + AT91_RSTC_RSTTYP_WAKEUP |
>> + AT91_RSTC_RSTTYP_WATCHDOG;
>> +}
>> diff --git a/arch/arm/boards/cpodc2/msp430.c b/arch/arm/boards/cpodc2/msp430.c
>> new file mode 100644
>> index 0000000..1c46528
>> --- /dev/null
>> +++ b/arch/arm/boards/cpodc2/msp430.c
>
> msp430 is a soc name please find something better and create as device not a
> command to set stuff so we can use parameter var in the shell
Ack to both...
>>
>> diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
>> index 5fb3ead..2701a98 100644
>> --- a/arch/arm/mach-at91/Kconfig
>> +++ b/arch/arm/mach-at91/Kconfig
>> @@ -271,6 +271,11 @@ config MACH_AT91SAM9261EK
>> Select this if you are using Atmel's AT91SAM9261-EK Evaluation Kit.
>> <http://www.atmel.com/dyn/products/tools_card.asp?tool_id=3820>
>>
>> +config MACH_CPODC2_9261
>> + bool "CPO Science DataCollector II v2.0"
>> + select MACH_CPODC2
>> + select HAVE_NAND_ATMEL_BUSWIDTH_16
>> +
>> config MACH_PM9261
>> bool "Ronetix PM9261"
>> select HAS_DM9000
>> @@ -297,12 +302,27 @@ config MACH_AT91SAM9G10EK
>> Select this if you are using Atmel's AT91SAM9G10-EK Evaluation Kit.
>> <http://www.atmel.com/dyn/products/tools_card.asp?tool_id=4588>
>>
>> +config MACH_CPODC2_9G10
>> + bool "CPO Science DataCollector II v2.1"
>> + select HAVE_NAND_ATMEL_BUSWIDTH_16
>> + select MACH_CPODC2
>> +
>> endchoice
>>
>> endif
>>
>> # ----------------------------------------------------------
>>
>> +if SOC_AT91SAM9261
>> +
>> +config MACH_CPODC2
>> + bool
>> + depends on MACH_CPODC2_9261 || MACH_CPODC2_9G10
> why 2?
Because when I try to put in just MACH_CPODC2 under both MACH_AT91SAM9261 and MACH_AT91SAM9G10, KConfig complains.
Probably, the whole section should be reworked not to ask for CPU (MACH) first, but to ask for SOC first and CPU as a SOC option (if required, which
given the nice rework of the code here, shouldn't even be necessary, but I don't know about the other atmel soc families).
Thanks for the great critique and the excellent work you've been doing on the AT91 boards. You've really made my job easier now that I can start
switching over to your work.
Cheers,
Darren.
More information about the barebox
mailing list