Merge branch 'hw-huffdctycc' into net-mjpeg

diff --git a/grlib-gpl-1.0.22-b4095/designs/BLANCA-AVP/.config b/grlib-gpl-1.0.22-b4095/designs/BLANCA-AVP/.config
index fb6ee7a..dd9d8fe 100644 (file)
--- a/grlib-gpl-1.0.22-b4095/designs/BLANCA-AVP/.config
+++ b/grlib-gpl-1.0.22-b4095/designs/BLANCA-AVP/.config
@@ -168,18 +168,8 @@ CONFIG_MMU_PAGE_PROG=y
 # Debug Support Unit        
 #
 CONFIG_DSU_ENABLE=y
-CONFIG_DSU_ITRACE=y
-# CONFIG_DSU_ITRACESZ1 is not set
-CONFIG_DSU_ITRACESZ2=y
-# CONFIG_DSU_ITRACESZ4 is not set
-# CONFIG_DSU_ITRACESZ8 is not set
-# CONFIG_DSU_ITRACESZ16 is not set
-CONFIG_DSU_ATRACE=y
-# CONFIG_DSU_ATRACESZ1 is not set
-CONFIG_DSU_ATRACESZ2=y
-# CONFIG_DSU_ATRACESZ4 is not set
-# CONFIG_DSU_ATRACESZ8 is not set
-# CONFIG_DSU_ATRACESZ16 is not set
+# CONFIG_DSU_ITRACE is not set
+# CONFIG_DSU_ATRACE is not set
 
 #
 # Fault-tolerance  
@@ -204,7 +194,7 @@ CONFIG_APB_HADDR=800
 #
 # Debug Link           
 #
-CONFIG_DSU_UART=y
+# CONFIG_DSU_UART is not set
 # CONFIG_DSU_JTAG is not set
 # CONFIG_GRUSB_DCL is not set
 CONFIG_DSU_ETH=y
@@ -282,6 +272,7 @@ CONFIG_UA1_FIFO4=y
 # CONFIG_UA1_FIFO8 is not set
 # CONFIG_UA1_FIFO16 is not set
 # CONFIG_UA1_FIFO32 is not set
+# CONFIG_UART2_ENABLE is not set
 CONFIG_IRQ3_ENABLE=y
 # CONFIG_IRQ3_SEC is not set
 CONFIG_GPT_ENABLE=y
@@ -301,7 +292,7 @@ CONFIG_GPT_SEPIRQ=y
 #
 # Keybord and VGA interface
 #
-CONFIG_KBD_ENABLE=y
+# CONFIG_KBD_ENABLE is not set
 # CONFIG_VGA_ENABLE is not set
 CONFIG_SVGA_ENABLE=y
 

diff --git a/grlib-gpl-1.0.22-b4095/designs/BLANCA-AVP/config.vhd b/grlib-gpl-1.0.22-b4095/designs/BLANCA-AVP/config.vhd
index df7ffaf..765186f 100644 (file)
--- a/grlib-gpl-1.0.22-b4095/designs/BLANCA-AVP/config.vhd
+++ b/grlib-gpl-1.0.22-b4095/designs/BLANCA-AVP/config.vhd
@@ -67,8 +67,8 @@ package config is
   constant CFG_TLB_REP : integer := 0;
   constant CFG_MMU_PAGE : integer := 4;
   constant CFG_DSU : integer := 1;
-  constant CFG_ITBSZ : integer := 2;
-  constant CFG_ATBSZ : integer := 2;
+  constant CFG_ITBSZ : integer := 0;
+  constant CFG_ATBSZ : integer := 0;
   constant CFG_LEON3FT_EN : integer := 0;
   constant CFG_IUFT_EN : integer := 0;
   constant CFG_FPUFT_EN : integer := 0;
@@ -88,7 +88,7 @@ package config is
   constant CFG_AHB_MONERR : integer := 0;
   constant CFG_AHB_MONWAR : integer := 0;
 -- DSU UART
-  constant CFG_AHB_UART : integer := 1;
+  constant CFG_AHB_UART : integer := 0;
 -- JTAG based DSU interface
   constant CFG_AHB_JTAG : integer := 0;
 -- USB DSU
@@ -208,9 +208,9 @@ package config is
   constant CFG_GPT_WDOG : integer := 16#0#;
 
 -- GPIO port
-  constant CFG_GRGPIO_ENABLE : integer := 1;
+  constant CFG_GRGPIO_ENABLE : integer := 0;
   constant CFG_GRGPIO_IMASK : integer := 16#0000#;
-  constant CFG_GRGPIO_WIDTH : integer := (8);
+  constant CFG_GRGPIO_WIDTH : integer := 1;
 
 -- Spacewire interface
   constant CFG_SPW_EN : integer := 0;

diff --git a/grlib-gpl-1.0.22-b4095/designs/BLANCA-AVP/leon3mp.vhd b/grlib-gpl-1.0.22-b4095/designs/BLANCA-AVP/leon3mp.vhd
index 7484c5a..5ee7b9e 100644 (file)
--- a/grlib-gpl-1.0.22-b4095/designs/BLANCA-AVP/leon3mp.vhd
+++ b/grlib-gpl-1.0.22-b4095/designs/BLANCA-AVP/leon3mp.vhd
@@ -1032,9 +1032,9 @@ ethi.mdint <= '1';
   end generate;
 
 -------------------------------------------------------------------------------
---  YCC-RGB translation module          ---------------------------------------
+--  upsample YCC-RGB translation module ---------------------------------------
 -------------------------------------------------------------------------------
-    jpgycc : yccrgbs
+    jpgcore : huffdctycc
     generic map(shindex => 4, haddr => 16#A00#, hirq => 10, pindex => 12,
     paddr => 12, mhindex => CFG_NCPU+CFG_AHB_UART+CFG_GRETH+CFG_AHB_JTAG+
                  CFG_SVGA_ENABLE+CFG_SPW_NUM*CFG_SPW_EN+CFG_GRUSB_DCL+

diff --git a/snapgear-2.6-p42/user/jpeg-6b/jdatasrc.c b/snapgear-2.6-p42/user/jpeg-6b/jdatasrc.c
index 4bd2088..6e8e57a 100644 (file)
--- a/snapgear-2.6-p42/user/jpeg-6b/jdatasrc.c
+++ b/snapgear-2.6-p42/user/jpeg-6b/jdatasrc.c
@@ -101,6 +101,8 @@ fill_input_buffer (j_decompress_ptr cinfo)
     nbytes = JFREAD(src->infile, src->buffer, INPUT_BUF_SIZE);
   }
   if (nbytes <= 0) {
+    /* add for LEON mjpeg pj*/
+    exit(0);
     if (src->start_of_file)    /* Treat empty input file as fatal error */
       ERREXIT(cinfo, JERR_INPUT_EMPTY);
     WARNMS(cinfo, JWRN_JPEG_EOF);