From: Zach W. <zw...@us...> - 2009-12-03 13:32:19
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Main OpenOCD repository". The branch, master has been updated via 822c06d9e3983b37cd1830c594210973cb560991 (commit) via f7bd1e8f3a302378687ded559e865c258d441c89 (commit) via 12499f97fdeceb7175a4d3847d6b9e2c95ce8b34 (commit) via 66e45ba611b13bae0c6b7747ce27c37f7bfb21bc (commit) via 49675db9723ea6481ea38e9e34351123fc7954a0 (commit) via 8256a792c5a74ba0c37121652d3e753b65aee02d (commit) via c538a830cdaafa92c9e9a624d84915cc39cce05b (commit) via 6db3ed48c6d152446dafc70b8495970cd2b22d3a (commit) via 5e7369d99aaa27a4c110507a3f0b0431fa566090 (commit) via 2a402ae2c7bf5ce515ff5bfdd7d68f875686e289 (commit) via afb6d38bd52e508970cfcc4a0d26610f33f42875 (commit) via 450ceda9aec12a0b67cca8dfbaf0384824cbd6c2 (commit) via 9cbab8d3a6b6157629b75457b79e1b828c78bf6e (commit) via 2b2d5ec1e38efdd10ec64f8e880588350fb4edea (commit) via eac262e5d2a56e470e3d13becd646a135aa187c5 (commit) via 7a4f4457e5713eab8537a723ed10474287377225 (commit) via 5a94612148940db460252f2ad68585d96ee71415 (commit) via c6dd6a576d0b680f67ad9fd8af12fb342b26c83d (commit) via fa43bdff54a2f42e7c5a77304d8d1ffb3fe75ea5 (commit) via aaf948a6be72a92aef286c01f6902505364e8152 (commit) via 36e53978b91c124fb7388d795856fa01ab138dc5 (commit) via a8880f0b5ab7f5c9d4d3b031fd487caac766b99f (commit) via 7da02a8330d48f05f1ea9af93adb572f083aa728 (commit) via 0241b1e1054e7d3d187c0a41c7ffefab321b6b67 (commit) via 1650ab3a22d62c834126138f253643031c8418ba (commit) via 26e4fac57e2e022409b63a444928a41399a0a76b (commit) via 54063d72945e1022def8ad9b46dc61564eee1f22 (commit) via f52a5968604ae0dffc5b93e745724f850a416282 (commit) via a1c40f5120bd45f98974fd73d1cdaa10c674f09c (commit) via 377c5504b9cd040aa986d0927ab8aa49032b8584 (commit) via 56adfadb5de436ea627dc04a537917318317fd01 (commit) via ddea03304310e1342ee127fc7e6507bbfb237ae4 (commit) via 15accefbe284cfa0c4735ecb5ae3d2127ac8cfff (commit) via 98eea5680b491a26812214ddfeeafb3f088b94aa (commit) via 0c1bc6703cc76b61d352477af9a796dcab28adcd (commit) via 2c35b35e111b5a23a3316e02e419c212840c4cc2 (commit) via 41e92d8a7a987a5bbdeb7e5b36595c8bcc62e620 (commit) via 447f0896dd4652b240e316275913a6e13b11d03e (commit) via 9e3136a5f84a402ae9f5c9e24a1e6c2a7451aac3 (commit) via 28b17945059a4dcca4dba0ef30d07f0c3f328366 (commit) via 2958665f6b1239705a7dcc2b275810c394023f0f (commit) via 2641fd9576ae5e3c2856de9a06176b24d05149ac (commit) via cb4a475f6c26ff197cd9d601b0b9f86653d961a2 (commit) via 165fb9309d16ff91967f26ce8c01bfd176371506 (commit) via c9e448222cc5d1162f5e495cdfd327732c50a484 (commit) via df0e90ec8c728be50f1457ecc513d78de044f5a4 (commit) via 6512e5e36b067ae458cb7f6a9fdfb08d38da3583 (commit) via ba00ba47d289381d1fbfb84b6f4b18f8dff2f011 (commit) via 6c3a28ca260833dc2347d16792fb2cb2abec6e52 (commit) via c79cca04bed78839a18e73f3996805eb8001a812 (commit) via 35f1a40f6fad146db9d5546c47c45472d0ef0bed (commit) via 2fc071c6e1180f8dab1e2513106d5e18213fdc8b (commit) via 14ed20967f660ca888bba53c47c1c648f470f8e2 (commit) via 0b7720d2ffc92a1a27bc01cb05ebd7d8d83c427c (commit) via 264d24495d7ff0048bd5c49736042ed66b90f7a6 (commit) via d1bc4375e99ce52b72988494f35beca364234bae (commit) via 5d57cad00136ac4191483ff5c04d8795c8ea3bde (commit) via 4bbe7d174f1d307487db1db86da62676a8a9fb6c (commit) via 896ac8d4ef3212f80887bf009d626c5becb1240a (commit) from a976ce2dd4d3d6f0e851a5903494805ea60133f4 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 822c06d9e3983b37cd1830c594210973cb560991 Author: Zachary T Welch <zw...@su...> Date: Sat Nov 28 16:27:10 2009 -0800 remove tertiary include paths With all #include directives converted, we only need to have the top-level src/ directory in the search path. diff --git a/src/Makefile.am b/src/Makefile.am index 2033752..e6462c1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -24,15 +24,7 @@ noinst_HEADERS = \ # set the include path found by configure AM_CPPFLAGS = \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/helper \ - -I$(top_srcdir)/src/jtag \ - -I$(top_srcdir)/src/target \ - -I$(top_srcdir)/src/xsvf \ - -I$(top_srcdir)/src/svf \ - -I$(top_srcdir)/src/server \ - -I$(top_srcdir)/src/flash \ - -I$(top_srcdir)/src/pld + -I$(top_srcdir)/src libopenocd_la_CPPFLAGS = -DPKGBLDDATE=\"`date +%F-%R`\" diff --git a/src/flash/Makefile.am b/src/flash/Makefile.am index ee322ee..cda59e4 100644 --- a/src/flash/Makefile.am +++ b/src/flash/Makefile.am @@ -3,10 +3,7 @@ SUBDIRS = \ nand AM_CPPFLAGS = \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/helper \ - -I$(top_srcdir)/src/jtag \ - -I$(top_srcdir)/src/target + -I$(top_srcdir)/src METASOURCES = AUTO noinst_LTLIBRARIES = libflash.la diff --git a/src/flash/nand/Makefile.am b/src/flash/nand/Makefile.am index 921b7f3..34947b6 100644 --- a/src/flash/nand/Makefile.am +++ b/src/flash/nand/Makefile.am @@ -1,9 +1,4 @@ -AM_CPPFLAGS = \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/flash \ - -I$(top_srcdir)/src/helper \ - -I$(top_srcdir)/src/jtag \ - -I$(top_srcdir)/src/target +AM_CPPFLAGS = -I$(top_srcdir)/src noinst_LTLIBRARIES = libocdflashnand.la diff --git a/src/flash/nor/Makefile.am b/src/flash/nor/Makefile.am index 1be84be..211366b 100644 --- a/src/flash/nor/Makefile.am +++ b/src/flash/nor/Makefile.am @@ -1,9 +1,4 @@ -AM_CPPFLAGS = \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/helper \ - -I$(top_srcdir)/src/jtag \ - -I$(top_srcdir)/src/flash \ - -I$(top_srcdir)/src/target +AM_CPPFLAGS = -I$(top_srcdir)/src noinst_LTLIBRARIES = libocdflashnor.la libocdflashnor_la_SOURCES = \ diff --git a/src/helper/Makefile.am b/src/helper/Makefile.am index bf8527f..4f74b9a 100644 --- a/src/helper/Makefile.am +++ b/src/helper/Makefile.am @@ -1,7 +1,5 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/server \ - -I$(top_srcdir)/src/target \ -DPKGDATADIR=\"$(pkgdatadir)\" METASOURCES = AUTO diff --git a/src/jtag/Makefile.am b/src/jtag/Makefile.am index 4ca0c78..39b4b59 100644 --- a/src/jtag/Makefile.am +++ b/src/jtag/Makefile.am @@ -1,7 +1,5 @@ AM_CPPFLAGS = \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/helper \ - -I$(top_srcdir)/src/target + -I$(top_srcdir)/src METASOURCES = AUTO noinst_LTLIBRARIES = libjtag.la diff --git a/src/jtag/drivers/Makefile.am b/src/jtag/drivers/Makefile.am index 4e2bce0..92a96f3 100644 --- a/src/jtag/drivers/Makefile.am +++ b/src/jtag/drivers/Makefile.am @@ -1,7 +1,4 @@ -AM_CPPFLAGS = \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/helper \ - -I$(top_srcdir)/src/jtag +AM_CPPFLAGS = -I$(top_srcdir)/src noinst_LTLIBRARIES = libocdjtagdrivers.la diff --git a/src/pld/Makefile.am b/src/pld/Makefile.am index d99a89c..fa40e56 100644 --- a/src/pld/Makefile.am +++ b/src/pld/Makefile.am @@ -1,8 +1,5 @@ AM_CPPFLAGS = \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/server \ - -I$(top_srcdir)/src/helper \ - -I$(top_srcdir)/src/jtag + -I$(top_srcdir)/src METASOURCES = AUTO noinst_LTLIBRARIES = libpld.la diff --git a/src/server/Makefile.am b/src/server/Makefile.am index 989a682..de83a06 100644 --- a/src/server/Makefile.am +++ b/src/server/Makefile.am @@ -1,9 +1,5 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/helper \ - -I$(top_srcdir)/src/target \ - -I$(top_srcdir)/src/flash \ - -I$(top_srcdir)/src/jtag \ -DPKGDATADIR=\"$(pkgdatadir)\" METASOURCES = AUTO diff --git a/src/svf/Makefile.am b/src/svf/Makefile.am index 10cb967..adc415f 100644 --- a/src/svf/Makefile.am +++ b/src/svf/Makefile.am @@ -1,8 +1,5 @@ AM_CPPFLAGS = \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/server \ - -I$(top_srcdir)/src/helper \ - -I$(top_srcdir)/src/jtag + -I$(top_srcdir)/src METASOURCES = AUTO noinst_LTLIBRARIES = libsvf.la diff --git a/src/target/Makefile.am b/src/target/Makefile.am index cd90355..7631bea 100644 --- a/src/target/Makefile.am +++ b/src/target/Makefile.am @@ -6,10 +6,7 @@ OOCD_TRACE_FILES = endif AM_CPPFLAGS = \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/helper \ - -I$(top_srcdir)/src/jtag \ - -I$(top_srcdir)/src/xsvf + -I$(top_srcdir)/src BIN2C = $(top_builddir)/src/helper/bin2char$(EXEEXT_FOR_BUILD) diff --git a/src/xsvf/Makefile.am b/src/xsvf/Makefile.am index 5a58e26..3e2a04e 100644 --- a/src/xsvf/Makefile.am +++ b/src/xsvf/Makefile.am @@ -1,9 +1,5 @@ AM_CPPFLAGS = \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/server \ - -I$(top_srcdir)/src/helper \ - -I$(top_srcdir)/src/svf \ - -I$(top_srcdir)/src/jtag + -I$(top_srcdir)/src METASOURCES = AUTO noinst_LTLIBRARIES = libxsvf.la commit f7bd1e8f3a302378687ded559e865c258d441c89 Author: Zachary T Welch <zw...@su...> Date: Thu Dec 3 03:46:15 2009 -0800 change #include "../hello.h" to "hello.h" Before we can -I the top-level src/ directory alone, references to "hello.h" must be updated. This is an internal header, so it does not need angle brackets. diff --git a/src/flash/nand/nonce.c b/src/flash/nand/nonce.c index f441164..8d15040 100644 --- a/src/flash/nand/nonce.c +++ b/src/flash/nand/nonce.c @@ -21,6 +21,7 @@ #include "config.h" #endif #include <flash/nand.h> +#include "hello.h" static int nonce_nand_command(struct nand_device *nand, uint8_t command) @@ -68,6 +69,7 @@ static int nonce_nand_init(struct nand_device *nand) struct nand_flash_controller nonce_nand_controller = { .name = "nonce", + .commands = hello_command_handlers, .nand_device_command = &nonce_nand_device_command, .init = &nonce_nand_init, .reset = &nonce_nand_reset, diff --git a/src/flash/nor/faux.c b/src/flash/nor/faux.c index 49a0f72..c996522 100644 --- a/src/flash/nor/faux.c +++ b/src/flash/nor/faux.c @@ -23,7 +23,7 @@ #include <flash/flash.h> #include <target/image.h> -#include "../hello.h" +#include "hello.h" struct faux_flash_bank diff --git a/src/jtag/drivers/dummy.c b/src/jtag/drivers/dummy.c index 7370c81..1880712 100644 --- a/src/jtag/drivers/dummy.c +++ b/src/jtag/drivers/dummy.c @@ -23,7 +23,7 @@ #include <jtag/interface.h> #include "bitbang.h" -#include "../hello.h" +#include "hello.h" /* my private tap controller state, which tracks state for calling code */ diff --git a/src/target/testee.c b/src/target/testee.c index 4527388..991c64e 100644 --- a/src/target/testee.c +++ b/src/target/testee.c @@ -23,7 +23,7 @@ #include "target.h" #include "target_type.h" #include <helper/log.h> -#include "../hello.h" +#include "hello.h" static const struct command_registration testee_command_handlers[] = { { commit 12499f97fdeceb7175a4d3847d6b9e2c95ce8b34 Author: Zachary T Welch <zw...@su...> Date: Thu Dec 3 04:15:05 2009 -0800 change #include "xsvf.h" to <xsvf/xsvf.h> Changes from the flat namespace to heirarchical one. Instead of writing: #include "xsvf.h" the following form should be used. #include <xsvf/xsvf.h> The exception is from .c files in the same directory. diff --git a/src/ecosboard.c b/src/ecosboard.c index 5dcbfcb..6e41eba 100644 --- a/src/ecosboard.c +++ b/src/ecosboard.c @@ -25,7 +25,7 @@ #include <jtag/jtag.h> #include <helper/ioutil.h> #include <helper/configuration.h> -#include "xsvf.h" +#include <xsvf/xsvf.h> #include <svf/svf.h> #include <flash/nand.h> #include <pld/pld.h> diff --git a/src/openocd.c b/src/openocd.c index a77bf89..793aa6a 100644 --- a/src/openocd.c +++ b/src/openocd.c @@ -32,7 +32,7 @@ #include <jtag/jtag.h> #include <helper/ioutil.h> #include <helper/configuration.h> -#include "xsvf.h" +#include <xsvf/xsvf.h> #include <svf/svf.h> #include <flash/nand.h> #include <pld/pld.h> commit 66e45ba611b13bae0c6b7747ce27c37f7bfb21bc Author: Zachary T Welch <zw...@su...> Date: Thu Dec 3 04:15:05 2009 -0800 change #include "svf.h" to <svf/svf.h> Changes from the flat namespace to heirarchical one. Instead of writing: #include "svf.h" the following form should be used. #include <svf/svf.h> The exception is from .c files in the same directory. diff --git a/src/ecosboard.c b/src/ecosboard.c index e4e5cb9..5dcbfcb 100644 --- a/src/ecosboard.c +++ b/src/ecosboard.c @@ -26,7 +26,7 @@ #include <helper/ioutil.h> #include <helper/configuration.h> #include "xsvf.h" -#include "svf.h" +#include <svf/svf.h> #include <flash/nand.h> #include <pld/pld.h> diff --git a/src/openocd.c b/src/openocd.c index 138f5cb..a77bf89 100644 --- a/src/openocd.c +++ b/src/openocd.c @@ -33,7 +33,7 @@ #include <helper/ioutil.h> #include <helper/configuration.h> #include "xsvf.h" -#include "svf.h" +#include <svf/svf.h> #include <flash/nand.h> #include <pld/pld.h> #include <flash/mflash.h> diff --git a/src/xsvf/xsvf.c b/src/xsvf/xsvf.c index 5cacbed..b1ddea9 100644 --- a/src/xsvf/xsvf.c +++ b/src/xsvf/xsvf.c @@ -42,7 +42,7 @@ #include "xsvf.h" #include <jtag/jtag.h> -#include "svf.h" +#include <svf/svf.h> /* XSVF commands, from appendix B of xapp503.pdf */ commit 49675db9723ea6481ea38e9e34351123fc7954a0 Author: Zachary T Welch <zw...@su...> Date: Thu Dec 3 04:15:04 2009 -0800 change #include "pld.h" to <pld/pld.h> Changes from the flat namespace to heirarchical one. Instead of writing: #include "pld.h" the following form should be used. #include <pld/pld.h> The exception is from .c files in the same directory. diff --git a/src/ecosboard.c b/src/ecosboard.c index fa2e2c6..e4e5cb9 100644 --- a/src/ecosboard.c +++ b/src/ecosboard.c @@ -28,7 +28,7 @@ #include "xsvf.h" #include "svf.h" #include <flash/nand.h> -#include "pld.h" +#include <pld/pld.h> #include <server/server.h> #include <server/telnet_server.h> diff --git a/src/openocd.c b/src/openocd.c index cbb28b7..138f5cb 100644 --- a/src/openocd.c +++ b/src/openocd.c @@ -35,7 +35,7 @@ #include "xsvf.h" #include "svf.h" #include <flash/nand.h> -#include "pld.h" +#include <pld/pld.h> #include <flash/mflash.h> #include <server/server.h> commit 8256a792c5a74ba0c37121652d3e753b65aee02d Author: Zachary T Welch <zw...@su...> Date: Thu Dec 3 04:15:03 2009 -0800 change #include "telnet_server.h" to <server/telnet_server.h> Changes from the flat namespace to heirarchical one. Instead of writing: #include "telnet_server.h" the following form should be used. #include <server/telnet_server.h> The exception is from .c files in the same directory. diff --git a/src/ecosboard.c b/src/ecosboard.c index 53ad7ba..fa2e2c6 100644 --- a/src/ecosboard.c +++ b/src/ecosboard.c @@ -31,7 +31,7 @@ #include "pld.h" #include <server/server.h> -#include "telnet_server.h" +#include <server/telnet_server.h> #include <server/gdb_server.h> #include "openocd.h" commit c538a830cdaafa92c9e9a624d84915cc39cce05b Author: Zachary T Welch <zw...@su...> Date: Thu Dec 3 04:15:03 2009 -0800 change #include "server.h" to <server/server.h> Changes from the flat namespace to heirarchical one. Instead of writing: #include "server.h" the following form should be used. #include <server/server.h> The exception is from .c files in the same directory. diff --git a/src/ecosboard.c b/src/ecosboard.c index d94f8b4..53ad7ba 100644 --- a/src/ecosboard.c +++ b/src/ecosboard.c @@ -30,7 +30,7 @@ #include <flash/nand.h> #include "pld.h" -#include "server.h" +#include <server/server.h> #include "telnet_server.h" #include <server/gdb_server.h> #include "openocd.h" diff --git a/src/helper/log.c b/src/helper/log.c index 3067ecc..6adde4b 100644 --- a/src/helper/log.c +++ b/src/helper/log.c @@ -29,7 +29,7 @@ #include "time_support.h" // @todo the inclusion of server.h here is a layering violation -#include "server.h" +#include <server/server.h> #include <stdarg.h> diff --git a/src/helper/options.c b/src/helper/options.c index 3db96fd..573026a 100644 --- a/src/helper/options.c +++ b/src/helper/options.c @@ -26,7 +26,7 @@ #include "configuration.h" // @todo the inclusion of server.h here is a layering violation -#include "server.h" +#include <server/server.h> #include <getopt.h> diff --git a/src/openocd.c b/src/openocd.c index 58ad617..cbb28b7 100644 --- a/src/openocd.c +++ b/src/openocd.c @@ -38,7 +38,7 @@ #include "pld.h" #include <flash/mflash.h> -#include "server.h" +#include <server/server.h> #include <server/gdb_server.h> #include <server/httpd.h> diff --git a/src/server/tcl_server.h b/src/server/tcl_server.h index e0d7b16..68ad821 100644 --- a/src/server/tcl_server.h +++ b/src/server/tcl_server.h @@ -20,7 +20,7 @@ #ifndef _TCL_SERVER_H_ #define _TCL_SERVER_H_ -#include "server.h" +#include <server/server.h> int tcl_init(struct command_context *cmd_ctx); int tcl_register_commands(struct command_context *cmd_ctx); diff --git a/src/server/telnet_server.h b/src/server/telnet_server.h index 7e39822..b0c5ceb 100644 --- a/src/server/telnet_server.h +++ b/src/server/telnet_server.h @@ -26,7 +26,7 @@ #ifndef TELNET_SERVER_H #define TELNET_SERVER_H -#include "server.h" +#include <server/server.h> #define TELNET_BUFFER_SIZE (1024) commit 6db3ed48c6d152446dafc70b8495970cd2b22d3a Author: Zachary T Welch <zw...@su...> Date: Thu Dec 3 04:15:03 2009 -0800 change #include "httpd.h" to <server/httpd.h> Changes from the flat namespace to heirarchical one. Instead of writing: #include "httpd.h" the following form should be used. #include <server/httpd.h> The exception is from .c files in the same directory. diff --git a/src/openocd.c b/src/openocd.c index c061423..58ad617 100644 --- a/src/openocd.c +++ b/src/openocd.c @@ -40,7 +40,7 @@ #include "server.h" #include <server/gdb_server.h> -#include "httpd.h" +#include <server/httpd.h> #ifdef HAVE_STRINGS_H #include <strings.h> commit 5e7369d99aaa27a4c110507a3f0b0431fa566090 Author: Zachary T Welch <zw...@su...> Date: Thu Dec 3 04:15:02 2009 -0800 change #include "gdb_server.h" to <server/gdb_server.h> Changes from the flat namespace to heirarchical one. Instead of writing: #include "gdb_server.h" the following form should be used. #include <server/gdb_server.h> The exception is from .c files in the same directory. diff --git a/src/ecosboard.c b/src/ecosboard.c index 2464868..d94f8b4 100644 --- a/src/ecosboard.c +++ b/src/ecosboard.c @@ -32,7 +32,7 @@ #include "server.h" #include "telnet_server.h" -#include "gdb_server.h" +#include <server/gdb_server.h> #include "openocd.h" #include <time_support.h> diff --git a/src/openocd.c b/src/openocd.c index 9377816..c061423 100644 --- a/src/openocd.c +++ b/src/openocd.c @@ -39,7 +39,7 @@ #include <flash/mflash.h> #include "server.h" -#include "gdb_server.h" +#include <server/gdb_server.h> #include "httpd.h" #ifdef HAVE_STRINGS_H commit 2a402ae2c7bf5ce515ff5bfdd7d68f875686e289 Author: Zachary T Welch <zw...@su...> Date: Thu Dec 3 04:15:02 2009 -0800 change #include "s3c24xx_regs.h" to <flash/nand/s3c24xx_regs.h> Changes from the flat namespace to heirarchical one. Instead of writing: #include "s3c24xx_regs.h" the following form should be used. #include <flash/nand/s3c24xx_regs.h> The exception is from .c files in the same directory. diff --git a/src/flash/nand/s3c24xx.h b/src/flash/nand/s3c24xx.h index 0f899da..f89bf6e 100644 --- a/src/flash/nand/s3c24xx.h +++ b/src/flash/nand/s3c24xx.h @@ -28,7 +28,7 @@ */ #include <flash/nand.h> -#include "s3c24xx_regs.h" +#include <flash/nand/s3c24xx_regs.h> struct s3c24xx_nand_controller { commit afb6d38bd52e508970cfcc4a0d26610f33f42875 Author: Zachary T Welch <zw...@su...> Date: Thu Dec 3 04:14:58 2009 -0800 change #include "ocl.h" to <flash/nor/ocl.h> Changes from the flat namespace to heirarchical one. Instead of writing: #include "ocl.h" the following form should be used. #include <flash/nor/ocl.h> The exception is from .c files in the same directory. diff --git a/src/flash/ocl/at91sam7x/main.c b/src/flash/ocl/at91sam7x/main.c index 2146d74..e4c0c3f 100644 --- a/src/flash/ocl/at91sam7x/main.c +++ b/src/flash/ocl/at91sam7x/main.c @@ -19,7 +19,7 @@ ***************************************************************************/ #include "platform.h" -#include "ocl.h" +#include <flash/nor/ocl.h> #include "dcc.h" #include "samflash.h" commit 450ceda9aec12a0b67cca8dfbaf0384824cbd6c2 Author: Zachary T Welch <zw...@su...> Date: Thu Dec 3 04:14:55 2009 -0800 change #include "nand.h" to <flash/nand.h> Changes from the flat namespace to heirarchical one. Instead of writing: #include "nand.h" the following form should be used. #include <flash/nand.h> The exception is from .c files in the same directory. diff --git a/src/ecosboard.c b/src/ecosboard.c index b42a777..2464868 100644 --- a/src/ecosboard.c +++ b/src/ecosboard.c @@ -27,7 +27,7 @@ #include <helper/configuration.h> #include "xsvf.h" #include "svf.h" -#include "nand.h" +#include <flash/nand.h> #include "pld.h" #include "server.h" diff --git a/src/flash/arm_nandio.h b/src/flash/arm_nandio.h index 6788e36..27b3ad3 100644 --- a/src/flash/arm_nandio.h +++ b/src/flash/arm_nandio.h @@ -1,7 +1,7 @@ #ifndef __ARM_NANDIO_H #define __ARM_NANDIO_H -#include "nand.h" +#include <flash/nand.h> #include <helper/binarybuffer.h> /** diff --git a/src/flash/nand/lpc3180.c b/src/flash/nand/lpc3180.c index 031e6b1..80284cc 100644 --- a/src/flash/nand/lpc3180.c +++ b/src/flash/nand/lpc3180.c @@ -22,7 +22,7 @@ #endif #include "lpc3180.h" -#include "nand.h" +#include <flash/nand.h> static int lpc3180_reset(struct nand_device *nand); static int lpc3180_controller_ready(struct nand_device *nand, int timeout); diff --git a/src/flash/nand/mx3.h b/src/flash/nand/mx3.h index 09289ae..94dbf0c 100644 --- a/src/flash/nand/mx3.h +++ b/src/flash/nand/mx3.h @@ -25,7 +25,7 @@ * * Many thanks to Ben Dooks for writing s3c24xx driver. */ -#include "nand.h" +#include <flash/nand.h> #define MX3_NF_BASE_ADDR 0xb8000000 #define MX3_NF_BUFSIZ (MX3_NF_BASE_ADDR + 0xe00) diff --git a/src/flash/nand/nonce.c b/src/flash/nand/nonce.c index dae62a7..f441164 100644 --- a/src/flash/nand/nonce.c +++ b/src/flash/nand/nonce.c @@ -20,7 +20,7 @@ #ifdef HAVE_CONFIG_H #include "config.h" #endif -#include "nand.h" +#include <flash/nand.h> static int nonce_nand_command(struct nand_device *nand, uint8_t command) diff --git a/src/flash/nand/s3c24xx.h b/src/flash/nand/s3c24xx.h index 38057b2..0f899da 100644 --- a/src/flash/nand/s3c24xx.h +++ b/src/flash/nand/s3c24xx.h @@ -27,7 +27,7 @@ * Many thanks to Simtec Electronics for sponsoring this work. */ -#include "nand.h" +#include <flash/nand.h> #include "s3c24xx_regs.h" struct s3c24xx_nand_controller diff --git a/src/openocd.c b/src/openocd.c index eae8c0c..9377816 100644 --- a/src/openocd.c +++ b/src/openocd.c @@ -34,7 +34,7 @@ #include <helper/configuration.h> #include "xsvf.h" #include "svf.h" -#include "nand.h" +#include <flash/nand.h> #include "pld.h" #include <flash/mflash.h> commit 9cbab8d3a6b6157629b75457b79e1b828c78bf6e Author: Zachary T Welch <zw...@su...> Date: Thu Dec 3 04:14:55 2009 -0800 change #include "mflash.h" to <flash/mflash.h> Changes from the flat namespace to heirarchical one. Instead of writing: #include "mflash.h" the following form should be used. #include <flash/mflash.h> The exception is from .c files in the same directory. diff --git a/src/openocd.c b/src/openocd.c index 38eb57b..eae8c0c 100644 --- a/src/openocd.c +++ b/src/openocd.c @@ -36,7 +36,7 @@ #include "svf.h" #include "nand.h" #include "pld.h" -#include "mflash.h" +#include <flash/mflash.h> #include "server.h" #include "gdb_server.h" commit 2b2d5ec1e38efdd10ec64f8e880588350fb4edea Author: Zachary T Welch <zw...@su...> Date: Thu Dec 3 04:14:54 2009 -0800 change #include "flash.h" to <flash/flash.h> Changes from the flat namespace to heirarchical one. Instead of writing: #include "flash.h" the following form should be used. #include <flash/flash.h> The exception is from .c files in the same directory. diff --git a/src/flash/nand.h b/src/flash/nand.h index a30a654..d73aee1 100644 --- a/src/flash/nand.h +++ b/src/flash/nand.h @@ -25,7 +25,7 @@ #ifndef NAND_H #define NAND_H -#include "flash.h" +#include <flash/flash.h> struct nand_device; diff --git a/src/flash/nor/aduc702x.c b/src/flash/nor/aduc702x.c index a8d76ce..6696912 100644 --- a/src/flash/nor/aduc702x.c +++ b/src/flash/nor/aduc702x.c @@ -23,7 +23,7 @@ #include "config.h" #endif -#include "flash.h" +#include <flash/flash.h> #include <target/armv4_5.h> #include <helper/binarybuffer.h> #include <helper/time_support.h> diff --git a/src/flash/nor/at91sam3.c b/src/flash/nor/at91sam3.c index 5f7e8d7..dd4f347 100644 --- a/src/flash/nor/at91sam3.c +++ b/src/flash/nor/at91sam3.c @@ -61,7 +61,7 @@ #include <string.h> #include <stddef.h> #include <helper/types.h> -#include "flash.h" +#include <flash/flash.h> #include <helper/membuf.h> #include "at91sam3.h" #include <helper/time_support.h> diff --git a/src/flash/nor/at91sam7.h b/src/flash/nor/at91sam7.h index 4510686..8077879 100644 --- a/src/flash/nor/at91sam7.h +++ b/src/flash/nor/at91sam7.h @@ -23,7 +23,7 @@ #ifndef AT91SAM7_H #define AT91SAM7_H -#include "flash.h" +#include <flash/flash.h> struct at91sam7_flash_bank { diff --git a/src/flash/nor/avrf.c b/src/flash/nor/avrf.c index 2bc4438..fbc9277 100644 --- a/src/flash/nor/avrf.c +++ b/src/flash/nor/avrf.c @@ -23,7 +23,7 @@ #include "avrf.h" #include <target/avrt.h> -#include "flash.h" +#include <flash/flash.h> /* AVR_JTAG_Instructions */ diff --git a/src/flash/nor/cfi.h b/src/flash/nor/cfi.h index d55fd34..565a2b6 100644 --- a/src/flash/nor/cfi.h +++ b/src/flash/nor/cfi.h @@ -20,7 +20,7 @@ #ifndef CFI_H #define CFI_H -#include "flash.h" +#include <flash/flash.h> #define CFI_STATUS_POLL_MASK_DQ5_DQ6_DQ7 0xE0 /* DQ5..DQ7 */ #define CFI_STATUS_POLL_MASK_DQ6_DQ7 0xC0 /* DQ6..DQ7 */ diff --git a/src/flash/nor/ecos.c b/src/flash/nor/ecos.c index 81223b6..8f8f746 100644 --- a/src/flash/nor/ecos.c +++ b/src/flash/nor/ecos.c @@ -21,7 +21,7 @@ #include "config.h" #endif -#include "flash.h" +#include <flash/flash.h> #include <target/embeddedice.h> #include <target/image.h> #include <target/algorithm.h> diff --git a/src/flash/nor/faux.c b/src/flash/nor/faux.c index 124ca3e..49a0f72 100644 --- a/src/flash/nor/faux.c +++ b/src/flash/nor/faux.c @@ -21,7 +21,7 @@ #include "config.h" #endif -#include "flash.h" +#include <flash/flash.h> #include <target/image.h> #include "../hello.h" diff --git a/src/flash/nor/lpc2000.h b/src/flash/nor/lpc2000.h index 08e278a..30be304 100644 --- a/src/flash/nor/lpc2000.h +++ b/src/flash/nor/lpc2000.h @@ -23,7 +23,7 @@ #ifndef LPC2000_H #define LPC2000_H -#include "flash.h" +#include <flash/flash.h> typedef enum { diff --git a/src/flash/nor/lpc288x.h b/src/flash/nor/lpc288x.h index 5a71ee0..06f634a 100644 --- a/src/flash/nor/lpc288x.h +++ b/src/flash/nor/lpc288x.h @@ -21,7 +21,7 @@ #ifndef lpc288x_H #define lpc288x_H -#include "flash.h" +#include <flash/flash.h> struct lpc288x_flash_bank { diff --git a/src/flash/nor/lpc2900.c b/src/flash/nor/lpc2900.c index c1fefd7..dc466f8 100644 --- a/src/flash/nor/lpc2900.c +++ b/src/flash/nor/lpc2900.c @@ -24,7 +24,7 @@ #include <target/image.h> -#include "flash.h" +#include <flash/flash.h> #include <helper/binarybuffer.h> #include <target/armv4_5.h> #include <target/algorithm.h> diff --git a/src/flash/nor/non_cfi.h b/src/flash/nor/non_cfi.h index 44c92db..cc6004e 100644 --- a/src/flash/nor/non_cfi.h +++ b/src/flash/nor/non_cfi.h @@ -20,7 +20,7 @@ #ifndef NON_CFI_H #define NON_CFI_H -#include "flash.h" +#include <flash/flash.h> struct non_cfi { diff --git a/src/flash/nor/ocl.c b/src/flash/nor/ocl.c index 57d9efa..6e3ad1c 100644 --- a/src/flash/nor/ocl.c +++ b/src/flash/nor/ocl.c @@ -22,7 +22,7 @@ #endif #include "ocl.h" -#include "flash.h" +#include <flash/flash.h> #include <target/embeddedice.h> diff --git a/src/flash/nor/pic32mx.h b/src/flash/nor/pic32mx.h index 92f40c2..b33e831 100644 --- a/src/flash/nor/pic32mx.h +++ b/src/flash/nor/pic32mx.h @@ -26,7 +26,7 @@ #ifndef PIC32MX_H #define PIC32MX_H -#include "flash.h" +#include <flash/flash.h> struct pic32mx_flash_bank { diff --git a/src/flash/nor/stellaris.h b/src/flash/nor/stellaris.h index 949a346..85b709c 100644 --- a/src/flash/nor/stellaris.h +++ b/src/flash/nor/stellaris.h @@ -20,7 +20,7 @@ #ifndef STELLARIS_FLASH_H #define STELLARIS_FLASH_H -#include "flash.h" +#include <flash/flash.h> struct stellaris_flash_bank { diff --git a/src/flash/nor/stm32x.h b/src/flash/nor/stm32x.h index 6cd047e..b6e00ed 100644 --- a/src/flash/nor/stm32x.h +++ b/src/flash/nor/stm32x.h @@ -23,7 +23,7 @@ #ifndef STM32X_H #define STM32X_H -#include "flash.h" +#include <flash/flash.h> struct stm32x_options { diff --git a/src/flash/nor/str7x.h b/src/flash/nor/str7x.h index 81af0f1..4daafb7 100644 --- a/src/flash/nor/str7x.h +++ b/src/flash/nor/str7x.h @@ -23,7 +23,7 @@ #ifndef STR7X_H #define STR7X_H -#include "flash.h" +#include <flash/flash.h> struct str7x_flash_bank { diff --git a/src/flash/nor/str9x.h b/src/flash/nor/str9x.h index c9d5152..29adecf 100644 --- a/src/flash/nor/str9x.h +++ b/src/flash/nor/str9x.h @@ -23,7 +23,7 @@ #ifndef STR9X_H #define STR9X_H -#include "flash.h" +#include <flash/flash.h> struct str9x_flash_bank { diff --git a/src/flash/nor/str9xpec.h b/src/flash/nor/str9xpec.h index 1d5ce94..cb2ac78 100644 --- a/src/flash/nor/str9xpec.h +++ b/src/flash/nor/str9xpec.h @@ -23,7 +23,7 @@ #ifndef STR9XPEC_H #define STR9XPEC_H -#include "flash.h" +#include <flash/flash.h> #include <jtag/jtag.h> struct str9xpec_flash_controller diff --git a/src/flash/nor/tms470.h b/src/flash/nor/tms470.h index f275e51..b2fea1b 100644 --- a/src/flash/nor/tms470.h +++ b/src/flash/nor/tms470.h @@ -20,7 +20,7 @@ #ifndef TMS470_DOT_H #define TMS470_DOT_H -#include "flash.h" +#include <flash/flash.h> struct tms470_flash_bank { diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c index 9185233..40380a8 100644 --- a/src/server/gdb_server.c +++ b/src/server/gdb_server.c @@ -31,7 +31,7 @@ #include <target/target_request.h> #include <target/register.h> #include "server.h" -#include "flash.h" +#include <flash/flash.h> #include "gdb_server.h" #include <target/image.h> #include <jtag/jtag.h> commit eac262e5d2a56e470e3d13becd646a135aa187c5 Author: Zachary T Welch <zw...@su...> Date: Thu Dec 3 04:14:54 2009 -0800 change #include "arm_nandio.h" to <flash/arm_nandio.h> Changes from the flat namespace to heirarchical one. Instead of writing: #include "arm_nandio.h" the following form should be used. #include <flash/arm_nandio.h> The exception is from .c files in the same directory. diff --git a/src/flash/nand/davinci.c b/src/flash/nand/davinci.c index 72cd378..40be36d 100644 --- a/src/flash/nand/davinci.c +++ b/src/flash/nand/davinci.c @@ -28,7 +28,7 @@ #include "config.h" #endif -#include "arm_nandio.h" +#include <flash/arm_nandio.h> enum ecc { diff --git a/src/flash/nand/orion.c b/src/flash/nand/orion.c index 0f08fe4..436151f 100644 --- a/src/flash/nand/orion.c +++ b/src/flash/nand/orion.c @@ -26,7 +26,7 @@ #include "config.h" #endif -#include "arm_nandio.h" +#include <flash/arm_nandio.h> #include <target/armv4_5.h> commit 7a4f4457e5713eab8537a723ed10474287377225 Author: Zachary T Welch <zw...@su...> Date: Thu Dec 3 04:14:52 2009 -0800 change #include "trace.h" to <target/trace.h> Changes from the flat namespace to heirarchical one. Instead of writing: #include "trace.h" the following form should be used. #include <target/trace.h> The exception is from .c files in the same directory. diff --git a/src/target/etm.h b/src/target/etm.h index 60e4ea7..656e04b 100644 --- a/src/target/etm.h +++ b/src/target/etm.h @@ -23,7 +23,7 @@ #ifndef ETM_H #define ETM_H -#include "trace.h" +#include <target/trace.h> #include <target/arm_jtag.h> struct image; diff --git a/src/target/xscale.h b/src/target/xscale.h index c083b06..6f81178 100644 --- a/src/target/xscale.h +++ b/src/target/xscale.h @@ -25,7 +25,7 @@ #include <target/armv4_5.h> #include <target/armv4_5_mmu.h> -#include "trace.h" +#include <target/trace.h> #define XSCALE_COMMON_MAGIC 0x58534341 commit 5a94612148940db460252f2ad68585d96ee71415 Author: Zachary T Welch <zw...@su...> Date: Thu Dec 3 04:14:51 2009 -0800 change #include "target_request.h" to <target/target_request.h> Changes from the flat namespace to heirarchical one. Instead of writing: #include "target_request.h" the following form should be used. #include <target/target_request.h> The exception is from .c files in the same directory. diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c index 3129401..9185233 100644 --- a/src/server/gdb_server.c +++ b/src/server/gdb_server.c @@ -28,7 +28,7 @@ #endif #include <target/breakpoints.h> -#include "target_request.h" +#include <target/target_request.h> #include <target/register.h> #include "server.h" #include "flash.h" diff --git a/src/server/telnet_server.c b/src/server/telnet_server.c index 8a86efa..929c1c1 100644 --- a/src/server/telnet_server.c +++ b/src/server/telnet_server.c @@ -28,7 +28,7 @@ #endif #include "telnet_server.h" -#include "target_request.h" +#include <target/target_request.h> static unsigned short telnet_port = 4444; commit c6dd6a576d0b680f67ad9fd8af12fb342b26c83d Author: Zachary T Welch <zw...@su...> Date: Thu Dec 3 04:14:51 2009 -0800 change #include "target.h" to <target/target.h> Changes from the flat namespace to heirarchical one. Instead of writing: #include "target.h" the following form should be used. #include <target/target.h> The exception is from .c files in the same directory. diff --git a/src/flash/flash.h b/src/flash/flash.h index fea7372..5e31c48 100644 --- a/src/flash/flash.h +++ b/src/flash/flash.h @@ -26,7 +26,7 @@ #ifndef FLASH_H #define FLASH_H -#include "target.h" +#include <target/target.h> #include <helper/log.h> struct image; diff --git a/src/flash/mflash.c b/src/flash/mflash.c index 63e71db..aa02e15 100644 --- a/src/flash/mflash.c +++ b/src/flash/mflash.c @@ -22,7 +22,7 @@ #endif #include "mflash.h" -#include "target.h" +#include <target/target.h> #include <helper/time_support.h> #include <helper/fileio.h> #include <helper/log.h> diff --git a/src/helper/command.c b/src/helper/command.c index d657668..76050ef 100644 --- a/src/helper/command.c +++ b/src/helper/command.c @@ -36,7 +36,7 @@ #endif // @todo the inclusion of target.h here is a layering violation -#include "target.h" +#include <target/target.h> #include "command.h" #include "configuration.h" #include "log.h" diff --git a/src/server/httpd.c b/src/server/httpd.c index b346ca2..9554ff0 100644 --- a/src/server/httpd.c +++ b/src/server/httpd.c @@ -26,7 +26,7 @@ #endif #include "telnet_server.h" -#include "target.h" +#include <target/target.h> #include <microhttpd.h> #include <pthread.h> diff --git a/src/server/server.c b/src/server/server.c index 0f977a7..2f4bfb0 100644 --- a/src/server/server.c +++ b/src/server/server.c @@ -28,7 +28,7 @@ #endif #include "server.h" -#include "target.h" +#include <target/target.h> #include "openocd.h" #include "tcl_server.h" #include "telnet_server.h" diff --git a/src/target/armv4_5.h b/src/target/armv4_5.h index 9b6237b..6c83c3b 100644 --- a/src/target/armv4_5.h +++ b/src/target/armv4_5.h @@ -26,7 +26,7 @@ #ifndef ARMV4_5_H #define ARMV4_5_H -#include "target.h" +#include <target/target.h> #include <helper/command.h> diff --git a/src/target/mips32.h b/src/target/mips32.h index ee5bd42..98186af 100644 --- a/src/target/mips32.h +++ b/src/target/mips32.h @@ -23,7 +23,7 @@ #ifndef MIPS32_H #define MIPS32_H -#include "target.h" +#include <target/target.h> #include <target/mips32_pracc.h> commit fa43bdff54a2f42e7c5a77304d8d1ffb3fe75ea5 Author: Zachary T Welch <zw...@su...> Date: Thu Dec 3 04:14:50 2009 -0800 change #include "register.h" to <target/register.h> Changes from the flat namespace to heirarchical one. Instead of writing: #include "register.h" the following form should be used. #include <target/register.h> The exception is from .c files in the same directory. diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c index cd8c46c..3129401 100644 --- a/src/server/gdb_server.c +++ b/src/server/gdb_server.c @@ -29,7 +29,7 @@ #include <target/breakpoints.h> #include "target_request.h" -#include "register.h" +#include <target/register.h> #include "server.h" #include "flash.h" #include "gdb_server.h" commit aaf948a6be72a92aef286c01f6902505364e8152 Author: Zachary T Welch <zw...@su...> Date: Thu Dec 3 04:14:49 2009 -0800 change #include "mips_ejtag.h" to <target/mips_ejtag.h> Changes from the flat namespace to heirarchical one. Instead of writing: #include "mips_ejtag.h" the following form should be used. #include <target/mips_ejtag.h> The exception is from .c files in the same directory. diff --git a/src/target/mips32_dmaacc.h b/src/target/mips32_dmaacc.h index c1aa07d..e614c12 100644 --- a/src/target/mips32_dmaacc.h +++ b/src/target/mips32_dmaacc.h @@ -25,7 +25,7 @@ #ifndef MIPS32_DMAACC_H #define MIPS32_DMAACC_H -#include "mips_ejtag.h" +#include <target/mips_ejtag.h> #define EJTAG_CTRL_DMA_BYTE 0x00000000 #define EJTAG_CTRL_DMA_HALFWORD 0x00000080 diff --git a/src/target/mips32_pracc.h b/src/target/mips32_pracc.h index 5d1cf3d..eceea5d 100644 --- a/src/target/mips32_pracc.h +++ b/src/target/mips32_pracc.h @@ -22,7 +22,7 @@ #ifndef MIPS32_PRACC_H #define MIPS32_PRACC_H -#include "mips_ejtag.h" +#include <target/mips_ejtag.h> #define MIPS32_PRACC_TEXT 0xFF200200 //#define MIPS32_PRACC_STACK 0xFF2FFFFC commit 36e53978b91c124fb7388d795856fa01ab138dc5 Author: Zachary T Welch <zw...@su...> Date: Thu Dec 3 04:14:49 2009 -0800 change #include "mips32_pracc.h" to <target/mips32_pracc.h> Changes from the flat namespace to heirarchical one. Instead of writing: #include "mips32_pracc.h" the following form should be used. #include <target/mips32_pracc.h> The exception is from .c files in the same directory. diff --git a/src/target/mips32.h b/src/target/mips32.h index 7d1928e..ee5bd42 100644 --- a/src/target/mips32.h +++ b/src/target/mips32.h @@ -24,7 +24,7 @@ #define MIPS32_H #include "target.h" -#include "mips32_pracc.h" +#include <target/mips32_pracc.h> #define MIPS32_COMMON_MAGIC 0xB320B320 commit a8880f0b5ab7f5c9d4d3b031fd487caac766b99f Author: Zachary T Welch <zw...@su...> Date: Thu Dec 3 04:14:48 2009 -0800 change #include "mips32.h" to <target/mips32.h> Changes from the flat namespace to heirarchical one. Instead of writing: #include "mips32.h" the following form should be used. #include <target/mips32.h> The exception is from .c files in the same directory. diff --git a/src/flash/nor/pic32mx.c b/src/flash/nor/pic32mx.c index 9bb6c97..d2289b2 100644 --- a/src/flash/nor/pic32mx.c +++ b/src/flash/nor/pic32mx.c @@ -28,7 +28,7 @@ #endif #include "pic32mx.h" -#include "mips32.h" +#include <target/mips32.h> static commit 7da02a8330d48f05f1ea9af93adb572f083aa728 Author: Zachary T Welch <zw...@su...> Date: Thu Dec 3 04:14:47 2009 -0800 change #include "image.h" to <target/image.h> Changes from the flat namespace to heirarchical one. Instead of writing: #include "image.h" the following form should be used. #include <target/image.h> The exception is from .c files in the same directory. diff --git a/src/flash/flash.c b/src/flash/flash.c index e910e42..d16949d 100644 --- a/src/flash/flash.c +++ b/src/flash/flash.c @@ -29,7 +29,7 @@ #include "flash.h" #include "common.h" -#include "image.h" +#include <target/image.h> #include <helper/time_support.h> static int flash_write_unlock(struct target *target, struct image *image, uint32_t *written, int erase, bool unlock); diff --git a/src/flash/nor/ecos.c b/src/flash/nor/ecos.c index ca8f3f5..81223b6 100644 --- a/src/flash/nor/ecos.c +++ b/src/flash/nor/ecos.c @@ -23,7 +23,7 @@ #include "flash.h" #include <target/embeddedice.h> -#include "image.h" +#include <target/image.h> #include <target/algorithm.h> diff --git a/src/flash/nor/faux.c b/src/flash/nor/faux.c index caec2c7..124ca3e 100644 --- a/src/flash/nor/faux.c +++ b/src/flash/nor/faux.c @@ -22,7 +22,7 @@ #endif #include "flash.h" -#include "image.h" +#include <target/image.h> #include "../hello.h" diff --git a/src/flash/nor/lpc2900.c b/src/flash/nor/lpc2900.c index cf74679..c1fefd7 100644 --- a/src/flash/nor/lpc2900.c +++ b/src/flash/nor/lpc2900.c @@ -23,7 +23,7 @@ #endif -#include "image.h" +#include <target/image.h> #include "flash.h" #include <helper/binarybuffer.h> #include <target/armv4_5.h> diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c index 5cda21e..cd8c46c 100644 --- a/src/server/gdb_server.c +++ b/src/server/gdb_server.c @@ -33,7 +33,7 @@ #include "server.h" #include "flash.h" #include "gdb_server.h" -#include "image.h" +#include <target/image.h> #include <jtag/jtag.h> commit 0241b1e1054e7d3d187c0a41c7ffefab321b6b67 Author: Zachary T Welch <zw...@su...> Date: Thu Dec 3 04:14:46 2009 -0800 change #include "etm.h" to <target/etm.h> Changes from the flat namespace to heirarchical one. Instead of writing: #include "etm.h" the following form should be used. #include <target/etm.h> The exception is from .c files in the same directory. diff --git a/src/target/etm_dummy.h b/src/target/etm_dummy.h index 2673e4f..95980f8 100644 --- a/src/target/etm_dummy.h +++ b/src/target/etm_dummy.h @@ -20,7 +20,7 @@ #ifndef ETM_DUMMY_H #define ETM_DUMMY_H -#include "etm.h" +#include <target/etm.h> extern struct etm_capture_driver etm_dummy_capture_driver; diff --git a/src/target/oocd_trace.h b/src/target/oocd_trace.h index 8234b65..7c334f2 100644 --- a/src/target/oocd_trace.h +++ b/src/target/oocd_trace.h @@ -20,7 +20,7 @@ #ifndef OOCD_TRACE_H #define OOCD_TRACE_H -#include "etm.h" +#include <target/etm.h> #include <termios.h> commit 1650ab3a22d62c834126138f253643031c8418ba Author: Zachary T Welch <zw...@su...> Date: Thu Dec 3 04:14:45 2009 -0800 change #include "embeddedice.h" to <target/embeddedice.h> Changes from the flat namespace to heirarchical one. Instead of writing: #include "embeddedice.h" the following form should be used. #include <target/embeddedice.h> The exception is from .c files in the same directory. diff --git a/src/flash/nor/ecos.c b/src/flash/nor/ecos.c index f689e15..ca8f3f5 100644 --- a/src/flash/nor/ecos.c +++ b/src/flash/nor/ecos.c @@ -22,7 +22,7 @@ #endif #include "flash.h" -#include "embeddedice.h" +#include <target/embeddedice.h> #include "image.h" #include <target/algorithm.h> diff --git a/src/flash/nor/ocl.c b/src/flash/nor/ocl.c index 388395f..57d9efa 100644 --- a/src/flash/nor/ocl.c +++ b/src/flash/nor/ocl.c @@ -23,7 +23,7 @@ #include "ocl.h" #include "flash.h" -#include "embeddedice.h" +#include <target/embeddedice.h> struct ocl_priv diff --git a/src/jtag/minidummy/minidummy.c b/src/jtag/minidummy/minidummy.c index 8ada579..e60e832 100644 --- a/src/jtag/minidummy/minidummy.c +++ b/src/jtag/minidummy/minidummy.c @@ -20,7 +20,7 @@ #include "config.h" #endif -#include "embeddedice.h" +#include <target/embeddedice.h> #include <jtag/minidriver.h> #include <jtag/interface.h> diff --git a/src/jtag/zy1000/zy1000.c b/src/jtag/zy1000/zy1000.c index ca70b2b..5b6e4ea 100644 --- a/src/jtag/zy1000/zy1000.c +++ b/src/jtag/zy1000/zy1000.c @@ -20,7 +20,7 @@ #include "config.h" #endif -#include "embeddedice.h" +#include <target/embeddedice.h> #include <jtag/minidriver.h> #include <jtag/interface.h> #include "zy1000_version.h" diff --git a/src/target/arm7tdmi.h b/src/target/arm7tdmi.h index b6bbe59..ce771e2 100644 --- a/src/target/arm7tdmi.h +++ b/src/target/arm7tdmi.h @@ -23,7 +23,7 @@ #ifndef ARM7TDMI_H #define ARM7TDMI_H -#include "embeddedice.h" +#include <target/embeddedice.h> int arm7tdmi_init_arch_info(struct target *target, struct arm7_9_common *arm7_9, struct jtag_tap *tap); diff --git a/src/target/arm9tdmi.h b/src/target/arm9tdmi.h index aff9fc5..ea43690 100644 --- a/src/target/arm9tdmi.h +++ b/src/target/arm9tdmi.h @@ -23,7 +23,7 @@ #ifndef ARM9TDMI_H #define ARM9TDMI_H -#include "embeddedice.h" +#include <target/embeddedice.h> int arm9tdmi_init_target(struct command_context *cmd_ctx, struct target *target); commit 26e4fac57e2e022409b63a444928a41399a0a76b Author: Zachary T Welch <zw...@su...> Date: Thu Dec 3 04:14:44 2009 -0800 change #include "breakpoints.h" to <target/breakpoints.h> Changes from the flat namespace to heirarchical one. Instead of writing: #include "breakpoints.h" the following form should be used. #include <target/breakpoints.h> The exception is from .c files in the same directory. diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c index ef8d7f2..5cda21e 100644 --- a/src/server/gdb_server.c +++ b/src/server/gdb_server.c @@ -27,7 +27,7 @@ #include "config.h" #endif -#include "breakpoints.h" +#include <target/breakpoints.h> #include "target_request.h" #include "register.h" #include "server.h" commit 54063d72945e1022def8ad9b46dc61564eee1f22 Author: Zachary T Welch <zw...@su...> Date: Thu Dec 3 04:14:44 2009 -0800 change #include "avrt.h" to <target/avrt.h> Changes from the flat namespace to heirarchical one. Instead of writing: #include "avrt.h" the following form should be used. #include <target/avrt.h> The exception is from .c files in the same directory. diff --git a/src/flash/nor/avrf.c b/src/flash/nor/avrf.c index 687dd4b..2bc4438 100644 --- a/src/flash/nor/avrf.c +++ b/src/flash/nor/avrf.c @@ -22,7 +22,7 @@ #endif #include "avrf.h" -#include "avrt.h" +#include <target/avrt.h> #include "flash.h" commit f52a5968604ae0dffc5b93e745724f850a416282 Author: Zachary T Welch <zw...@su...> Date: Thu Dec 3 04:14:43 2009 -0800 change #include "armv7m.h" to <target/armv7m.h> Changes from the flat namespace to heirarchical one. Instead of writing: #include "armv7m.h" the following form should be used. #include <target/armv7m.h> The exception is from .c files in the same directory. diff --git a/src/flash/nor/lpc2000.c b/src/flash/nor/lpc2000.c index 9479a9f..295e3e7 100644 --- a/src/flash/nor/lpc2000.c +++ b/src/flash/nor/lpc2000.c @@ -26,7 +26,7 @@ #endif #include "lpc2000.h" -#include "armv7m.h" +#include <target/armv7m.h> #include <helper/binarybuffer.h> #include <target/algorithm.h> diff --git a/src/flash/nor/stellaris.c b/src/flash/nor/stellaris.c index 90b0ac6..f0028ea 100644 --- a/src/flash/nor/stellaris.c +++ b/src/flash/nor/stellaris.c @@ -29,7 +29,7 @@ #endif #include "stellaris.h" -#include "armv7m.h" +#include <target/armv7m.h> #include <helper/binarybuffer.h> #include <target/algorithm.h> diff --git a/src/flash/nor/stm32x.c b/src/flash/nor/stm32x.c index 581b650..3792547 100644 --- a/src/flash/nor/stm32x.c +++ b/src/flash/nor/stm32x.c @@ -25,7 +25,7 @@ #endif #include "stm32x.h" -#include "armv7m.h" +#include <target/armv7m.h> #include <helper/binarybuffer.h> #include <target/algorithm.h> diff --git a/src/target/cortex_m3.h b/src/target/cortex_m3.h index 7ce8901..c31c3f5 100644 --- a/src/target/cortex_m3.h +++ b/src/target/cortex_m3.h @@ -26,7 +26,7 @@ #ifndef CORTEX_M3_H #define CORTEX_M3_H -#include "armv7m.h" +#include <target/armv7m.h> #define CORTEX_M3_COMMON_MAGIC 0x1A451A45 commit a1c40f5120bd45f98974fd73d1cdaa10c674f09c Author: Zachary T Welch <zw...@su...> Date: Thu Dec 3 04:14:43 2009 -0800 change #include "armv7a.h" to <target/armv7a.h> Changes from the flat namespace to heirarchical one. Instead of writing: #include "armv7a.h" the following form should be used. #include <target/armv7a.h> The exception is from .c files in the same directory. diff --git a/src/target/cortex_a8.h b/src/target/cortex_a8.h index 87db23e..adffe93 100644 --- a/src/target/cortex_a8.h +++ b/src/target/cortex_a8.h @@ -29,7 +29,7 @@ #ifndef CORTEX_A8_H #define CORTEX_A8_H -#include "armv7a.h" +#include <target/armv7a.h> extern char* cortex_a8_state_strings[]; commit 377c5504b9cd040aa986d0927ab8aa49032b8584 Author: Zachary T Welch <zw...@su...> Date: Thu Dec 3 04:14:42 2009 -0800 change #include "armv4_5_mmu.h" to <target/armv4_5_mmu.h> Changes from the flat namespace to heirarchical one. Instead of writing: #include "armv4_5_mmu.h" the following form should be used. #include <target/armv4_5_mmu.h> The exception is from .c files in the same directory. diff --git a/src/target/arm720t.h b/src/target/arm720t.h index d78c07e..b13cff8 100644 --- a/src/target/arm720t.h +++ b/src/target/arm720t.h @@ -21,7 +21,7 @@ #define ARM720T_H #include <target/arm7tdmi.h> -#include "armv4_5_mmu.h" +#include <target/armv4_5_mmu.h> #define ARM720T_COMMON_MAGIC 0xa720a720 diff --git a/src/target/arm920t.h b/src/target/arm920t.h index 97d0261..0eb14fc 100644 --- a/src/target/arm920t.h +++ b/src/target/arm920t.h @@ -21,7 +21,7 @@ #define ARM920T_H #include <target/arm9tdmi.h> -#include "armv4_5_mmu.h" +#include <target/armv4_5_mmu.h> #define ARM920T_COMMON_MAGIC 0xa920a920 diff --git a/src/target/arm926ejs.h b/src/target/arm926ejs.h index 9202fc6..604ab08 100644 --- a/src/target/arm926ejs.h +++ b/src/target/arm926ejs.h @@ -21,7 +21,7 @@ #define ARM926EJS_H #include <target/arm9tdmi.h> -#include "armv4_5_mmu.h" +#include <target/armv4_5_mmu.h> #define ARM926EJS_COMMON_MAGIC 0xa926a926 diff --git a/src/target/armv7a.h b/src/target/armv7a.h index 6872b38..0d5da86 100644 --- a/src/target/armv7a.h +++ b/src/target/armv7a.h @@ -21,7 +21,7 @@ #include <target/arm_adi_v5.h> #include <target/armv4_5.h> -#include "armv4_5_mmu.h" +#include <target/armv4_5_mmu.h> #include <target/armv4_5_cache.h> #include <target/arm_dpm.h> diff --git a/src/target/xscale.h b/src/target/xscale.h index 9e19f45..c083b06 100644 --- a/src/target/xscale.h +++ b/src/target/xscale.h @@ -24,7 +24,7 @@ #define XSCALE_H #include <target/armv4_5.h> -#include "armv4_5_mmu.h" +#include <target/armv4_5_mmu.h> #include "trace.h" #define XSCALE_COMMON_MAGIC 0x58534341 commit 56adfadb5de436ea627dc04a537917318317fd01 Author: Zachary T Welch <zw...@su...> Date: Thu Dec 3 04:14:42 2009 -0800 change #include "armv4_5_cache.h" to <target/armv4_5_cache.h> Changes from the flat namespace to heirarchical one. Instead of writing: #include "armv4_5_cache.h" the following form should be used. #include <target/armv4_5_cache.h> The exception is from .c files in the same directory. diff --git a/src/target/armv4_5_mmu.h b/src/target/armv4_5_mmu.h index 6b9ed34..428a373 100644 --- a/src/target/armv4_5_mmu.h +++ b/src/target/armv4_5_mmu.h @@ -20,7 +20,7 @@ #ifndef ARMV4_5_MMU_H #define ARMV4_5_MMU_H -#include "armv4_5_cache.h" +#include <target/armv4_5_cache.h> struct target; diff --git a/src/target/armv7a.h b/src/target/armv7a.h index da8ccdf..6872b38 100644 --- a/src/target/armv7a.h +++ b/src/target/armv7a.h @@ -22,7 +22,7 @@ #include <target/arm_adi_v5.h> #include <target/armv4_5.h> #include "armv4_5_mmu.h" -#include "armv4_5_cache.h" +#include <target/armv4_5_cache.h> #include <target/arm_dpm.h> enum commit ddea03304310e1342ee127fc7e6507bbfb237ae4 Author: Zachary T Welch <zw...@su...> Date: Thu Dec 3 04:14:42 2009 -0800 change #include "armv4_5.h" to <target/armv4_5.h> Changes from the flat namespace to heirarchical one. Instead of writing: #include "armv4_5.h" the following form should be used. #include <target/armv4_5.h> The exception is from .c files in the same directory. diff --git a/src/flash/arm_nandio.c b/src/flash/arm_nandio.c index 4647c79..fdf2109 100644 --- a/src/flash/arm_nandio.c +++ b/src/flash/arm_nandio.c @@ -25,7 +25,7 @@ #endif #include "arm_nandio.h" -#include "armv4_5.h" +#include <target/armv4_5.h> #include <target/algorithm.h> /** diff --git a/src/flash/nand/orion.c b/src/flash/nand/orion.c index 77a03f2..0f08fe4 100644 --- a/src/flash/nand/orion.c +++ b/src/flash/nand/orion.c @@ -27,7 +27,7 @@ #endif #include "arm_nandio.h" -#include "armv4_5.h" +#include <target/armv4_5.h> struct orion_nand_controller diff --git a/src/flash/nor/aduc702x.c b/src/flash/nor/aduc702x.c index 402da1f..a8d76ce 100644 --- a/src/flash/nor/aduc702x.c +++ b/src/flash/nor/aduc702x.c @@ -24,7 +24,7 @@ #endif #include "flash.h" -#include "armv4_5.h" +#include <target/armv4_5.h> #include <helper/binarybuffer.h> #include <helper/time_support.h> #include <target/algorithm.h> diff --git a/src/flash/nor/cfi.c b/src/flash/nor/cfi.c index 043d742..61b5d4c 100644 --- a/src/flash/nor/cfi.c +++ b/src/flash/nor/cfi.c @@ -25,7 +25,7 @@ #include "cfi.h" #include "non_cfi.h" -#include "armv4_5.h" +#include <target/armv4_5.h> #include <helper/binarybuffer.h> #include <target/algorithm.h> diff --git a/src/flash/nor/lpc2900.c b/src/flash/nor/lpc2900.c index 9cbb9e4..cf74679 100644 --- a/src/flash/nor/lpc2900.c +++ b/src/flash/nor/lpc2900.c @@ -26,7 +26,7 @@ #include "image.h" #include "flash.h" #include <helper/binarybuffer.h> -#include "armv4_5.h" +#include <target/armv4_5.h> #include <target/algorithm.h> diff --git a/src/flash/nor/str7x.c b/src/flash/nor/str7x.c index 4da3f07..c5a1c34 100644 --- a/src/flash/nor/str7x.c +++ b/src/flash/nor/str7x.c @@ -25,7 +25,7 @@ #endif #include "str7x.h" -#include "armv4_5.h" +#include <target/armv4_5.h> #include <helper/binarybuffer.h> #include <target/algorithm.h> diff --git a/src/target/arm11.h b/src/target/arm11.h index fd14720..b118e1c 100644 --- a/src/target/arm11.h +++ b/src/target/arm11.h @@ -23,7 +23,7 @@ #ifndef ARM11_H #define ARM11_H -#include "armv4_5.h" +#include <target/armv4_5.h> #include <target/arm_dpm.h> #define ARM11_TAP_DEFAULT TAP_INVALID diff --git a/src/target/arm7_9_common.h b/src/target/arm7_9_common.h index 9cf8b41..7555bec 100644 --- a/src/target/arm7_9_common.h +++ b/src/target/arm7_9_common.h @@ -29,7 +29,7 @@ #ifndef ARM7_9_COMMON_H #define ARM7_9_COMMON_H -#include "armv4_5.h" +#include <target/armv4_5.h> #include <target/arm_jtag.h> #define ARM7_9_COMMON_MAGIC 0x0a790a79 /**< */ diff --git a/src/target/armv7a.h b/src/target/armv7a.h index 9158d78..da8ccdf 100644 --- a/src/target/armv7a.h +++ b/src/target/armv7a.h @@ -20,7 +20,7 @@ #define ARMV7A_H #include <target/arm_adi_v5.h> -#include "armv4_5.h" +#include <target/armv4_5.h> #include "armv4_5_mmu.h" #include "armv4_5_cache.h" #include <target/arm_dpm.h> diff --git a/src/target/armv7m.h b/src/target/armv7m.h index 46871e1..353860a 100644 --- a/src/target/armv7m.h +++ b/src/target/armv7m.h @@ -27,7 +27,7 @@ #define ARMV7M_COMMON_H #include <target/arm_adi_v5.h> -#include "armv4_5.h" +#include <target/armv4_5.h> /* define for enabling armv7 gdb workarounds */ #if 1 diff --git a/src/target/xscale.h b/src/target/xscale.h index 0a70ecb..9e19f45 100644 --- a/src/target/xscale.h +++ b/src/target/xscale.h @@ -23,7 +23,7 @@ #ifndef XSCALE_H #define XSCALE_H -#include "armv4_5.h" +#include <target/armv4_5.h> #include "armv4_5_mmu.h" #include "trace.h" commit 15accefbe284cfa0c4735ecb5ae3d2127ac8cfff Author: Zachary T Welch <zw...@su...> Date: Thu Dec 3 04:14:41 2009 -0800 change #include "arm_jtag.h" to <target/arm_jtag.h> Changes from the flat namespace to heirarchical one. Instead of writing: #include "arm_jtag.h" the following form should be used. #include <target/arm_jtag.h> The exception is from .c files in the same directory. diff --git a/src/target/arm7_9_common.h b/src/target/arm7_9_common.h index d43eaa6..9cf8b41 100644 --- a/src/target/arm7_9_common.h +++ b/src/target/arm7_9_common.h @@ -30,7 +30,7 @@ #define ARM7_9_COMMON_H #include "armv4_5.h" -#include "arm_jtag.h" +#include <target/arm_jtag.h> #define ARM7_9_COMMON_MAGIC 0x0a790a79 /**< */ diff --git a/src/target/arm_adi_v5.h b/src/target/arm_adi_v5.h index a78193c..c268f96 100644 --- a/src/target/arm_adi_v5.h +++ b/src/target/arm_adi_v5.h @@ -23,7 +23,7 @@ #ifndef ARM_ADI_V5_H #define ARM_ADI_V5_H -#include "arm_jtag.h" +#include <target/arm_jtag.h> #define DAP_IR_DPACC 0xA #define DAP_IR_APACC 0xB diff --git a/src/target/etm.h b/src/target/etm.h index c8da794..60e4ea7 100644 --- a/src/target/etm.h +++ b/src/target/etm.h @@ -24,7 +24,7 @@ #define ETM_H #include "trace.h" -#include "arm_jtag.h" +#include <target/arm_jtag.h> struct image; commit 98eea5680b491a26812214ddfeeafb3f088b94aa Author: Zachary T Welch <zw...@su...> Date: Thu Dec 3 04:14:40 2009 -0800 change #include "arm_dpm.h" to <target/arm_dpm.h> Changes from the flat namespace to heirarchical one. Instead of writing: #include "arm_dpm.h" the following form should be used. #include <target/arm_dpm.h> The exception is from .c files in the same directory. diff --git a/src/target/arm11.h b/src/target/arm11.h index cd52896..fd14720 100644 --- a/src/target/arm11.h +++ b/src/target/arm11.h @@ -24,7 +24,7 @@ #define ARM11_H #include "armv4_5.h" -#include "arm_dpm.h" +#include <target/arm_dpm.h> #define ARM11_TAP_DEFAULT TAP_INVALID diff --git a/src/target/armv7a.h b/src/target/armv7a.h index 2bd261a..9158d78 100644 --- a/src/target/armv7a.h +++ b/src/target/armv7a.h @@ -23,7 +23,7 @@ #include "armv4_5.h" #include "armv4_5_mmu.h" #include "armv4_5_cache.h" -#include "arm_dpm.h" +#include <target/arm_dpm.h> enum { commit 0c1bc6703cc76b61d352477af9a796dcab28adcd Author: Zachary T Welch <zw...@su...> Date: Thu Dec 3 04:14:39 2009 -0800 change #include "arm_adi_v5.h" to <target/arm_adi_v5.h> Changes from the flat namespace to heirarchical one. Instead of writing: #include "arm_adi_v5.h" the following form should be used. #include <target/arm_adi_v5.h> The exception is from .c files in the same directory. diff --git a/src/target/armv7a.h b/src/target/armv7a.h index 6ccf3e2..2bd261a 100644 --- a/src/target/armv7a.h +++ b/src/target/armv7a.h @@ -19,7 +19,7 @@ #ifndef ARMV7A_H #define ARMV7A_H -#include "arm_adi_v5.h" +#include <target/arm_adi_v5.h> #include "armv4_5.h" #include "armv4_5_mmu.h" #include "armv4_5_cache.h" diff --git a/src/target/armv7m.h b/src/target/armv7m.h index 7299bdf..46871e1 10064... [truncated message content] |