qi-hardware/f32xbase
1
0
Fork 0
mirror of git://projects.qi-hardware.com/f32xbase.git synced 2025-04-21 12:27:27 +03:00
Code Activity

Use config.h as the main source of configuration data. Fixed some boot.c

Browse Source 
glitches.

- fw/boot/boot.c, fw/boot/dfu.c: include config.h for platform defines
- fw/common/Makefile.common: add $(F32XBASE)/fw/common to include search
  path
- fw/boot/boot.c: define dummy for uart_init if no debugging is enabled
- fw/boot/boot.c (PLATFORM_EXIT): typo PLAYFORM_EXIT
- fw/boot/boot.c (run_payload): rename BOOT_SETUP to PLATFORM_SETUP
- fw/boot/dfu.c (device_descriptor): use USB_PRODUCT instead of
  USB_PRODUCT_IDBG_DFU
- fw/boot/config.h: removed for now. Might bring it back later as template.
- fw/boot/version.h: moved to fw/common/
- fw/common/Makefile.system: remove serial setup
This commit is contained in:
Werner Almesberger
2010-08-19 01:01:08 -03:00
parent fcfaec399a
commit 3f5ec8aa9e
6 changed files with 15 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
fw/boot/boot.c
View File

@@ -21,11 +21,17 @@
#include "version.h"
#include "regs.h"
#include "io.h"
#include "uart.h"
#include "usb.h"
#include "dfu.h"
#include "config.h"
#if !defined(CONFIG_DEBUG) && !defined(CONFIG_ERROR) && !defined(CONFIG_PRINTK)
#define uart_init(x)
#endif
/*
* GTA example:
@@ -57,7 +63,7 @@
void run_payload(void)
{
PLAYFORM_EXIT;
PLATFORM_EXIT;
/* No interrupts while jumping between worlds */
EA = 0;
@@ -204,7 +210,7 @@ static void boot_loader(void)
* the GTA01/02, once the system is powered up, IDBG exits this loop.
*/
BOOT_SETUP;
PLATFORM_SETUP;
dfu_init();
usb_init();
@@ -254,7 +260,9 @@ void main(void)
*/
OSCICN |= IFCN0;
uart_init(3);
if (REG0CN & VBSTAT)
boot_loader();
run_payload();

21
fw/boot/config.h
View File

@@ -1,21 +0,0 @@
/*
* boot/config.h - Boot loader configuration
*
* Written 2008 by Werner Almesberger
* Copyright 2008 Werner Almesberger
*
* 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.
*/
#ifndef CONFIG_H
#define CONFIG_H
//#define CONFIG_DEBUG
//#define CONFIG_ERROR
//#define CONFIG_PRINTK
#endif /* !CONFIG_H */

4
fw/boot/dfu.c
View File

@@ -32,6 +32,8 @@
#include "usb.h"
#include "dfu.h"
#include "config.h"
#ifndef NULL
#define NULL 0
@@ -50,7 +52,7 @@ const uint8_t device_descriptor[] = {
0x00, /* bDeviceProtocol (per interface) */
EP0_SIZE, /* bMaxPacketSize */
LE(USB_VENDOR), /* idVendor */
LE(USB_PRODUCT_IDBG_DFU),/* idProduct */
LE(USB_PRODUCT), /* idProduct */
LE(0x0001), /* bcdDevice */
0, /* iManufacturer */
0, /* iProduct */

26
fw/boot/version.h
View File

@@ -1,26 +0,0 @@
/*
* boot/version.h - Automatically generated version string
*
* Written 2008 by Werner Almesberger
* Copyright 2008 Werner Almesberger
*
* 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.
*/
#ifndef VERSION_H
#define VERSION_H
#include <stdint.h>
/*
* Oddly, sdcc seems to insist on the "extern" to mean "declaration".
*/
extern const char *build_date;
extern const uint16_t build_number;
#endif /* !VERSION_H */